vbox的更動 60305 路徑 trunk/src/VBox/Devices

時間撮記:

2016-4-4 下午03:19:44 (9 年 以前)

作者:

vboxsync

訊息:

Forward-ported r106360 (Audio/DrvHostCoreAudio.cpp: Fixes for ​bugref:8311. Untested).

檔案:

• trunk/src/VBox/Devices/Audio/DrvHostCoreAudio.cpp (修改) (14 筆差異)

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

@@ -295 +295 @@
     AudioUnit                   audioUnit;
     /** The audio converter if necessary. */
-    AudioConverterRef           converter;
+    AudioConverterRef           pConverter;
     /** Native buffer used for render the audio data in the recording thread. */
     AudioBufferList             bufferList;
@@ -411 +411 @@
     PCOREAUDIOSTREAMIN pStreamIn = (PCOREAUDIOSTREAMIN)pHstStrmIn;
 
-    drvHostCoreAudioFiniIn(pInterface, &pStreamIn->streamIn);
-
-    coreAudioInitIn(&pStreamIn->streamIn, NULL /* pcSamples */);
-    drvHostCoreAudioControlIn(pInterface, &pStreamIn->streamIn, PDMAUDIOSTREAMCMD_ENABLE);
-
-    return VINF_SUCCESS;
+    int rc = drvHostCoreAudioFiniIn(pInterface, &pStreamIn->streamIn);
+    if (RT_SUCCESS(rc))
+    {
+        rc = coreAudioInitIn(&pStreamIn->streamIn, NULL /* pcSamples */);
+        if (RT_SUCCESS(rc))
+            rc = drvHostCoreAudioControlIn(pInterface, &pStreamIn->streamIn, PDMAUDIOSTREAMCMD_ENABLE);
+    }
+
+    if (RT_FAILURE(rc))
+        LogRel(("CoreAudio: Unable to re-init input stream: %Rrc\n", rc));
+
+    return rc;
 }
 
@@ -426 +432 @@
     PCOREAUDIOSTREAMOUT pStreamOut = (PCOREAUDIOSTREAMOUT)pHstStrmOut;
 
-    drvHostCoreAudioFiniOut(pInterface, &pStreamOut->streamOut);
-
-    coreAudioInitOut(&pStreamOut->streamOut, NULL /* pcSamples */);
-    drvHostCoreAudioControlOut(pInterface, &pStreamOut->streamOut, PDMAUDIOSTREAMCMD_ENABLE);
-
-    return VINF_SUCCESS;
+    int rc = drvHostCoreAudioFiniOut(pInterface, &pStreamOut->streamOut);
+    if (RT_SUCCESS(rc))
+    {
+        rc = coreAudioInitOut(&pStreamOut->streamOut, NULL /* pcSamples */);
+        if (RT_SUCCESS(rc))
+            rc = drvHostCoreAudioControlOut(pInterface, &pStreamOut->streamOut, PDMAUDIOSTREAMCMD_ENABLE);
+    }
+
+    if (RT_FAILURE(rc))
+        LogRel(("CoreAudio: Unable to re-init output stream: %Rrc\n", rc));
+
+    return rc;
 }
 
@@ -548 +560 @@
     {
         /* Are we using a converter? */
-        if (pStreamIn->converter)
+        if (pStreamIn->pConverter)
         {
             /* First, render the data as usual. */
@@ -598 +610 @@
                 tmpList.mBuffers[0].mData         = puDst;
 
-                AudioConverterReset(pStreamIn->converter);
-
-                err = AudioConverterFillComplexBuffer(pStreamIn->converter, coreAudioConverterCb, pStreamIn,
+                AudioConverterReset(pStreamIn->pConverter);
+
+                err = AudioConverterFillComplexBuffer(pStreamIn->pConverter, coreAudioConverterCb, pStreamIn,
                                                       &ioOutputDataPacketSize, &tmpList, NULL);
                 if(   err != noErr
@@ -871 +883 @@
         LogRel(("CoreAudio: Input converter is active\n"));
 
-        err = AudioConverterNew(&pStreamIn->deviceFormat, &pStreamIn->streamFormat, &pStreamIn->converter);
+        err = AudioConverterNew(&pStreamIn->deviceFormat, &pStreamIn->streamFormat, &pStreamIn->pConverter);
         if (RT_UNLIKELY(err != noErr))
         {
@@ -890 +902 @@
             const SInt32 channelMap[2] = {0, 0}; /* Channel map for mono -> stereo, */
 
-            err = AudioConverterSetProperty(pStreamIn->converter, kAudioConverterChannelMap, sizeof(channelMap), channelMap);
+            err = AudioConverterSetProperty(pStreamIn->pConverter, kAudioConverterChannelMap, sizeof(channelMap), channelMap);
             if (err != noErr)
             {
@@ -987 +999 @@
     }
 
+    /* Destroy any former internal ring buffer. */
+    if (pStreamIn->pBuf)
+    {
+        RTCircBufDestroy(pStreamIn->pBuf);
+        pStreamIn->pBuf = NULL;
+    }
+
     /* Calculate the ratio between the device and the stream sample rate. */
     pStreamIn->sampleRatio = pStreamIn->streamFormat.mSampleRate / pStreamIn->deviceFormat.mSampleRate;
 
-    /* Set to zero first */
-    pStreamIn->pBuf = NULL;
     /* Create the AudioBufferList structure with one buffer. */
     pStreamIn->bufferList.mNumberBuffers = 1;
@@ -1290 +1307 @@
     }
 
+    /* Destroy any former internal ring buffer. */
+    if (pStreamOut->pBuf)
+    {
+        RTCircBufDestroy(pStreamOut->pBuf);
+        pStreamOut->pBuf = NULL;
+    }
+
     /* Create the internal ring buffer. */
     rc = RTCircBufCreate(&pStreamOut->pBuf, cSamples << pHstStrmOut->Props.cShift);
@@ -1803 +1827 @@
         }
 
-        if (pStreamIn->converter)
-        {
-            AudioConverterDispose(pStreamIn->converter);
-            pStreamIn->converter = NULL;
+        if (pStreamIn->pConverter)
+        {
+            AudioConverterDispose(pStreamIn->pConverter);
+            pStreamIn->pConverter = NULL;
         }
 
@@ -1815 +1839 @@
             if (RT_LIKELY(err == noErr))
             {
-                RTCircBufDestroy(pStreamIn->pBuf);
-
+                pStreamIn->deviceID      = kAudioDeviceUnknown;
                 pStreamIn->audioUnit     = NULL;
-                pStreamIn->deviceID      = kAudioDeviceUnknown;
-                pStreamIn->pBuf          = NULL;
+                pStreamIn->offBufferRead = 0;
                 pStreamIn->sampleRatio   = 1;
-                pStreamIn->offBufferRead = 0;
+                if (pStreamIn->pBuf)
+                {
+                    RTCircBufDestroy(pStreamIn->pBuf);
+                    pStreamIn->pBuf = NULL;
+                }
 
                 ASMAtomicXchgU32(&pStreamIn->status, CA_STATUS_UNINIT);
@@ -1911 +1937 @@
             if (err == noErr)
             {
-                RTCircBufDestroy(pStreamOut->pBuf);
-                pStreamOut->pBuf      = NULL;
-
+                pStreamOut->deviceID  = kAudioDeviceUnknown;
                 pStreamOut->audioUnit = NULL;
-                pStreamOut->deviceID  = kAudioDeviceUnknown;
+                if (pStreamOut->pBuf)
+                {
+                    RTCircBufDestroy(pStreamOut->pBuf);
+                    pStreamOut->pBuf = NULL;
+                }
 
                 ASMAtomicXchgU32(&pStreamOut->status, CA_STATUS_UNINIT);
@@ -1939 +1967 @@
     PCOREAUDIOSTREAMIN pStreamIn = (PCOREAUDIOSTREAMIN)pHstStrmIn;
 
-    LogFlowFunc(("enmRecSource=%ld\n"));
-
-    ASMAtomicXchgU32(&pStreamIn->status, CA_STATUS_UNINIT);
-
-    pStreamIn->audioUnit     = NULL;
-    pStreamIn->deviceID      = kAudioDeviceUnknown;
-    pStreamIn->converter     = NULL;
-    pStreamIn->sampleRatio   = 1;
-    pStreamIn->offBufferRead = 0;
-
-    bool fDeviceByUser = false;
+    LogFlowFunc(("enmRecSource=%ld\n", enmRecSource));
+
+    pStreamIn->deviceID                  = kAudioDeviceUnknown;
+    pStreamIn->audioUnit                 = NULL;
+    pStreamIn->pConverter                = NULL;
+    pStreamIn->bufferList.mNumberBuffers = 0;
+    pStreamIn->offBufferRead             = 0;
+    pStreamIn->sampleRatio               = 1;
+    pStreamIn->pBuf                      = NULL;
+    pStreamIn->status                    = CA_STATUS_UNINIT;
+    pStreamIn->fDefDevChgListReg         = false;
+
+    bool fDeviceByUser = false; /* Do we use a device which was set by the user? */
 
     /* Initialize the hardware info section with the audio settings */
@@ -1999 +2029 @@
     PCOREAUDIOSTREAMOUT pStreamOut = (PCOREAUDIOSTREAMOUT)pHstStrmOut;
 
-    OSStatus err = noErr;
-    int rc = 0;
-    bool fDeviceByUser = false; /* use we a device which was set by the user? */
-
     LogFlowFuncEnter();
 
-    ASMAtomicXchgU32(&pStreamOut->status, CA_STATUS_UNINIT);
-
-    pStreamOut->audioUnit = NULL;
-    pStreamOut->deviceID  = kAudioDeviceUnknown;
+    pStreamOut->deviceID                  = kAudioDeviceUnknown;
+    pStreamOut->audioUnit                 = NULL;
+    pStreamOut->pBuf                      = NULL;
+    pStreamOut->status                    = CA_STATUS_UNINIT;
+    pStreamOut->fDefDevChgListReg         = false;
+
+    bool fDeviceByUser = false; /* Do we use a device which was set by the user? */
 
     /* Initialize the hardware info section with the audio settings */
-    DrvAudioStreamCfgToProps(pCfg, &pStreamOut->streamOut.Props);
-
+    int rc = DrvAudioStreamCfgToProps(pCfg, &pStreamOut->streamOut.Props);
+    if (RT_SUCCESS(rc))
+    {
 #if 0
-    /* Try to find the audio device set by the user. Use
-     * export VBOX_COREAUDIO_OUTPUT_DEVICE_UID=AppleHDAEngineOutput:0
-     * to set it. */
-    if (DeviceUID.pszOutputDeviceUID)
-    {
-        pStreamOut->audioDeviceId = drvHostCoreAudioDeviceUIDtoID(DeviceUID.pszOutputDeviceUID);
-        /* Not fatal */
-        if (pStreamOut->audioDeviceId == kAudioDeviceUnknown)
-            LogRel(("CoreAudio: Unable to find output device %s. Falling back to the default audio device. \n", DeviceUID.pszOutputDeviceUID));
-        else
-            fDeviceByUser = true;
-    }
+        /* Try to find the audio device set by the user. Use
+         * export VBOX_COREAUDIO_OUTPUT_DEVICE_UID=AppleHDAEngineOutput:0
+         * to set it. */
+        if (DeviceUID.pszOutputDeviceUID)
+        {
+            pStreamOut->audioDeviceId = drvHostCoreAudioDeviceUIDtoID(DeviceUID.pszOutputDeviceUID);
+            /* Not fatal */
+            if (pStreamOut->audioDeviceId == kAudioDeviceUnknown)
+                LogRel(("CoreAudio: Unable to find output device %s. Falling back to the default audio device. \n", DeviceUID.pszOutputDeviceUID));
+            else
+                fDeviceByUser = true;
+        }
 #endif
-
-    rc = coreAudioInitOut(pHstStrmOut, pcSamples);
-    if (RT_FAILURE(rc))
-        return rc;
-
-    /* When the devices isn't forced by the user, we want default device change notifications. */
-    if (!fDeviceByUser)
-    {
-        AudioObjectPropertyAddress propAdr = { kAudioHardwarePropertyDefaultOutputDevice, kAudioObjectPropertyScopeGlobal,
-                                               kAudioObjectPropertyElementMaster };
-        err = AudioObjectAddPropertyListener(kAudioObjectSystemObject, &propAdr,
-                                             coreAudioDefaultDeviceChanged, (void *)pStreamOut);
-        /* Not fatal. */
-        if (RT_LIKELY(err == noErr))
-        {
-            pStreamOut->fDefDevChgListReg = true;
-        }
-        else
-            LogRel(("CoreAudio: Failed to add the default output device changed listener (%RI32)\n", err));
-    }
-
-    return VINF_SUCCESS;
+        rc = coreAudioInitOut(pHstStrmOut, pcSamples);
+    }
+
+    if (RT_SUCCESS(rc))
+    {
+        /* When the devices isn't forced by the user, we want default device change notifications. */
+        if (!fDeviceByUser)
+        {
+            AudioObjectPropertyAddress propAdr = { kAudioHardwarePropertyDefaultOutputDevice, kAudioObjectPropertyScopeGlobal,
+                                                   kAudioObjectPropertyElementMaster };
+            OSStatus err = AudioObjectAddPropertyListener(kAudioObjectSystemObject, &propAdr,
+                                                          coreAudioDefaultDeviceChanged, (void *)pStreamOut);
+            /* Not fatal. */
+            if (RT_LIKELY(err == noErr))
+            {
+                pStreamOut->fDefDevChgListReg = true;
+            }
+            else
+                LogRel(("CoreAudio: Failed to add the default output device changed listener (%RI32)\n", err));
+        }
+    }
+
+    LogFlowFuncLeaveRC(rc);
+    return rc;
 }