Changeset 89130 in vbox

Timestamp:

May 17, 2021 11:51:49 PM (4 years ago)

Author:

vboxsync

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

144471

Message:

AudioMixer: Copy the 'Device' bits to the CfgHost when creating a stream - CoreAudio backend wants the scheduling hint. bugref:9890

File:

• trunk/src/VBox/Devices/Audio/AudioMixer.cpp (modified) (3 diffs)

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

@@ -574 +574 @@
     AssertPtrNullReturn(ppStream, VERR_INVALID_POINTER);
     Assert(pSink->AIO.pDevIns == pDevIns); RT_NOREF(pDevIns); /* we'll probably be adding more statistics */
+    AssertReturn(pCfg->enmDir == pSink->enmDir, VERR_MISMATCH);
 
     /*
@@ -611 +612 @@
 
                 /*
-                 * Initialize the host-side configuration for the stream to be created.
-                 * Always use the sink's PCM audio format as the host side when creating a stream for it.
+                 * Initialize the host-side configuration for the stream to be created,
+                 * this is the sink format & direction with the src/dir, layout, name
+                 * and device specific config copied from the guest side config (pCfg).
                  */
                 AssertMsg(AudioHlpPcmPropsAreValid(&pSink->PCMProps),
@@ -620 +622 @@
                 rc = PDMAudioStrmCfgInitWithProps(&CfgHost, &pSink->PCMProps);
                 AssertRC(rc); /* cannot fail */
-
-                /* Apply the sink's direction for the configuration to use to create the stream. */
-                if (pSink->enmDir == PDMAUDIODIR_IN)
-                {
-                    CfgHost.enmDir      = PDMAUDIODIR_IN;
-                    CfgHost.u.enmSrc    = pCfg->u.enmSrc;
-                    CfgHost.enmLayout   = pCfg->enmLayout;
-                }
-                else
-                {
-                    CfgHost.enmDir      = PDMAUDIODIR_OUT;
-                    CfgHost.u.enmDst    = pCfg->u.enmDst;
-                    CfgHost.enmLayout   = pCfg->enmLayout;
-                }
-
+                CfgHost.enmDir    = pSink->enmDir;
+                CfgHost.u         = pCfg->u;
+                CfgHost.enmLayout = pCfg->enmLayout;
+                CfgHost.Device    = pCfg->Device;
                 RTStrCopy(CfgHost.szName, sizeof(CfgHost.szName), pCfg->szName);