Changeset 88534 in vbox for trunk/src/VBox/Devices/Audio

Timestamp:

Apr 15, 2021 12:16:56 PM (4 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

143810

Message:

Audio: Merged the cbStreamOut and cbStreamIn fields in PDMAUDIOBACKENDCFG (into cbStream). Added a fFlags member to PDMAUDIOBACKENDCFG, currently must-be-zero. bugref:9890

Location:

trunk/src/VBox/Devices/Audio

Files:

• DrvAudio.cpp (modified) (3 diffs)
• DrvHostAudioAlsa.cpp (modified) (1 diff)
• DrvHostAudioCoreAudio.cpp (modified) (1 diff)
• DrvHostAudioDSound.cpp (modified) (1 diff)
• DrvHostAudioDebug.cpp (modified) (1 diff)
• DrvHostAudioNull.cpp (modified) (1 diff)
• DrvHostAudioOss.cpp (modified) (1 diff)
• DrvHostAudioPulseAudio.cpp (modified) (1 diff)
• DrvHostAudioValidationKit.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Audio/DrvAudio.cpp

@@ -3000 +3000 @@
      */
     uint32_t *pcFreeStreams;
-    size_t    cbHstStrm;
     if (pCfgHost->enmDir == PDMAUDIODIR_IN)
     {
@@ -3009 +3008 @@
         }
         pcFreeStreams = &pThis->In.cStreamsFree;
-        cbHstStrm     = pThis->BackendCfg.cbStreamIn;
     }
     else /* Out */
@@ -3019 +3017 @@
         }
         pcFreeStreams = &pThis->Out.cStreamsFree;
-        cbHstStrm     = pThis->BackendCfg.cbStreamOut;
-    }
+    }
+    size_t const cbHstStrm = pThis->BackendCfg.cbStream;
     AssertStmt(cbHstStrm < _16M, rc = VERR_OUT_OF_RANGE);
     if (RT_SUCCESS(rc))

trunk/src/VBox/Devices/Audio/DrvHostAudioAlsa.cpp

@@ -240 +240 @@
      */
     RTStrCopy(pBackendCfg->szName, sizeof(pBackendCfg->szName), "ALSA");
-    pBackendCfg->cbStreamIn     = sizeof(ALSAAUDIOSTREAM);
-    pBackendCfg->cbStreamOut    = sizeof(ALSAAUDIOSTREAM);
+    pBackendCfg->cbStream       = sizeof(ALSAAUDIOSTREAM);
+    pBackendCfg->fFlags         = 0;
     /* ALSA allows exactly one input and one output used at a time for the selected device(s). */
     pBackendCfg->cMaxStreamsIn  = 1;

trunk/src/VBox/Devices/Audio/DrvHostAudioCoreAudio.cpp

@@ -2162 +2162 @@
 static DECLCALLBACK(int) drvHostCoreAudioHA_GetConfig(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDCFG pBackendCfg)
 {
-    AssertPtrReturn(pInterface,  VERR_INVALID_POINTER);
+    PDRVHOSTCOREAUDIO pThis = PDMIHOSTAUDIO_2_DRVHOSTCOREAUDIO(pInterface);
     AssertPtrReturn(pBackendCfg, VERR_INVALID_POINTER);
 
-    PDRVHOSTCOREAUDIO pThis = PDMIHOSTAUDIO_2_DRVHOSTCOREAUDIO(pInterface);
-
-    RT_BZERO(pBackendCfg, sizeof(PDMAUDIOBACKENDCFG));
-
-    RTStrPrintf2(pBackendCfg->szName, sizeof(pBackendCfg->szName), "Core Audio");
-
-    pBackendCfg->cbStreamIn  = sizeof(COREAUDIOSTREAM);
-    pBackendCfg->cbStreamOut = sizeof(COREAUDIOSTREAM);
-
+    /*
+     * Fill in the config structure.
+     */
+    RTStrCopy(pBackendCfg->szName, sizeof(pBackendCfg->szName), "Core Audio");
+    pBackendCfg->cbStream       = sizeof(COREAUDIOSTREAM);
+    pBackendCfg->fFlags         = 0;
     /* For Core Audio we provide one stream per device for now. */
     pBackendCfg->cMaxStreamsIn  = PDMAudioHostEnumCountMatching(&pThis->Devices, PDMAUDIODIR_IN);

trunk/src/VBox/Devices/Audio/DrvHostAudioDSound.cpp

@@ -685 +685 @@
     AssertPtrReturn(pBackendCfg, VERR_INVALID_POINTER);
 
-    RT_BZERO(pBackendCfg, sizeof(PPDMAUDIOBACKENDCFG));
-
-    pBackendCfg->cbStreamOut = sizeof(DSOUNDSTREAM);
-    pBackendCfg->cbStreamIn  = sizeof(DSOUNDSTREAM);
-
-    RTStrPrintf2(pBackendCfg->szName, sizeof(pBackendCfg->szName), "DirectSound");
-
+
+    /*
+     * Fill in the config structure.
+     */
+    RTStrCopy(pBackendCfg->szName, sizeof(pBackendCfg->szName), "DirectSound");
+    pBackendCfg->cbStream       = sizeof(DSOUNDSTREAM);
+    pBackendCfg->fFlags         = 0;
     pBackendCfg->cMaxStreamsIn  = UINT32_MAX;
     pBackendCfg->cMaxStreamsOut = UINT32_MAX;

trunk/src/VBox/Devices/Audio/DrvHostAudioDebug.cpp

@@ -106 +106 @@
     AssertPtrReturn(pBackendCfg, VERR_INVALID_POINTER);
 
+    /*
+     * Fill in the config structure.
+     */
     RTStrCopy(pBackendCfg->szName, sizeof(pBackendCfg->szName), "DebugAudio");
-
-    pBackendCfg->cbStreamOut    = sizeof(DEBUGAUDIOSTREAM);
-    pBackendCfg->cbStreamIn     = sizeof(DEBUGAUDIOSTREAM);
-
+    pBackendCfg->cbStream       = sizeof(DEBUGAUDIOSTREAM);
+    pBackendCfg->fFlags         = 0;
     pBackendCfg->cMaxStreamsOut = 1; /* Output; writing to a file. */
     pBackendCfg->cMaxStreamsIn  = 1; /* Input; generates a sine wave. */

trunk/src/VBox/Devices/Audio/DrvHostAudioNull.cpp

@@ -69 +69 @@
     AssertPtrReturn(pBackendCfg, VERR_INVALID_POINTER);
 
+    /*
+     * Fill in the config structure.
+     */
     RTStrCopy(pBackendCfg->szName, sizeof(pBackendCfg->szName), "NULL audio");
-
-    pBackendCfg->cbStreamOut    = sizeof(NULLAUDIOSTREAM);
-    pBackendCfg->cbStreamIn     = sizeof(NULLAUDIOSTREAM);
-
+    pBackendCfg->cbStream       = sizeof(NULLAUDIOSTREAM);
+    pBackendCfg->fFlags         = 0;
     pBackendCfg->cMaxStreamsOut = 1; /* Output */
     pBackendCfg->cMaxStreamsIn  = 2; /* Line input + microphone input. */

trunk/src/VBox/Devices/Audio/DrvHostAudioOss.cpp

@@ -181 +181 @@
     RT_NOREF(pInterface);
 
+    /*
+     * Fill in the config structure.
+     */
     RTStrCopy(pBackendCfg->szName, sizeof(pBackendCfg->szName), "OSS");
-
-    pBackendCfg->cbStreamIn  = sizeof(OSSAUDIOSTREAM);
-    pBackendCfg->cbStreamOut = sizeof(OSSAUDIOSTREAM);
+    pBackendCfg->cbStream       = sizeof(OSSAUDIOSTREAM);
+    pBackendCfg->fFlags         = 0;
+    pBackendCfg->cMaxStreamsIn  = 0;
+    pBackendCfg->cMaxStreamsOut = 0;
 
     int hFile = open("/dev/dsp", O_WRONLY | O_NONBLOCK, 0);

trunk/src/VBox/Devices/Audio/DrvHostAudioPulseAudio.cpp

@@ -646 +646 @@
      */
     RTStrCopy(pBackendCfg->szName, sizeof(pBackendCfg->szName), "PulseAudio");
-    pBackendCfg->cbStreamOut    = sizeof(PULSEAUDIOSTREAM);
-    pBackendCfg->cbStreamIn     = sizeof(PULSEAUDIOSTREAM);
+    pBackendCfg->cbStream       = sizeof(PULSEAUDIOSTREAM);
+    pBackendCfg->fFlags         = 0;
     pBackendCfg->cMaxStreamsOut = UINT32_MAX;
     pBackendCfg->cMaxStreamsIn  = UINT32_MAX;

trunk/src/VBox/Devices/Audio/DrvHostAudioValidationKit.cpp

@@ -96 +96 @@
     AssertPtrReturn(pBackendCfg, VERR_INVALID_POINTER);
 
-    RTStrPrintf2(pBackendCfg->szName, sizeof(pBackendCfg->szName), "Validation Kit");
-
-    pBackendCfg->cbStreamOut    = sizeof(VAKITAUDIOSTREAM);
-    pBackendCfg->cbStreamIn     = sizeof(VAKITAUDIOSTREAM);
-
+    /*
+     * Fill in the config structure.
+     */
+    RTStrCopy(pBackendCfg->szName, sizeof(pBackendCfg->szName), "Validation Kit");
+    pBackendCfg->cbStream       = sizeof(VAKITAUDIOSTREAM);
+    pBackendCfg->fFlags         = 0;
     pBackendCfg->cMaxStreamsOut = 1; /* Output */
     pBackendCfg->cMaxStreamsIn  = 0; /* No input supported yet. */