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

Timestamp:

Feb 25, 2015 6:08:56 PM (10 years ago)

Author:

vboxsync

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

98618

Message:

PDM/Audio: Update for Core Audio backend.

File:

• trunk/src/VBox/Devices/Audio/DrvHostCoreAudio.cpp (modified) (23 diffs)

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

@@ -693 +693 @@
 
             /* Get the device' UUID. */
-            propAdr.mSelector = kAudioObjectPropertyName;
+            propAdr.mSelector = kAudioDevicePropertyDeviceUID;
             err = AudioObjectGetPropertyData(pStreamIn->deviceID, &propAdr, 0, NULL, &uSize, &strTemp);
             if (err == noErr)
@@ -1007 +1007 @@
     {
         /* Fetch the default audio input device currently in use. */
-        AudioObjectPropertyAddress propAdr = { kAudioHardwarePropertyDefaultInputDevice,
+        AudioObjectPropertyAddress propAdr = { kAudioHardwarePropertyDefaultOutputDevice,
                                                kAudioObjectPropertyScopeGlobal, kAudioObjectPropertyElementMaster };
         uSize = sizeof(pStreamOut->deviceID);
-        err = AudioObjectGetPropertyData(kAudioObjectSystemObject, &propAdr, 0, NULL, &uSize,  &pStreamOut->deviceID);
+        err = AudioObjectGetPropertyData(kAudioObjectSystemObject, &propAdr, 0, NULL, &uSize, &pStreamOut->deviceID);
         if (err != noErr)
         {
@@ -1019 +1019 @@
 
     /*
-     * Try to get the name of the input device and log it. It's not fatal if it fails.
+     * Try to get the name of the output device and log it. It's not fatal if it fails.
      */
     CFStringRef strTemp;
@@ -1036 +1036 @@
 
             /* Get the device' UUID. */
-            propAdr.mSelector = kAudioObjectPropertyName;
+            propAdr.mSelector = kAudioDevicePropertyDeviceUID;
             err = AudioObjectGetPropertyData(pStreamOut->deviceID, &propAdr, 0, NULL, &uSize, &strTemp);
             if (err == noErr)
@@ -1545 +1545 @@
 
     int rc = VINF_SUCCESS;
+    OSStatus err;
 
     switch (enmStreamCmd)
@@ -1553 +1554 @@
             if (!drvHostCoreAudioIsRunning(pStreamOut->deviceID))
             {
-                OSStatus err = AudioUnitReset(pStreamOut->audioUnit, kAudioUnitScope_Input, 0);
+                err = AudioUnitReset(pStreamOut->audioUnit, kAudioUnitScope_Input, 0);
                 if (err != noErr)
                 {
@@ -1565 +1566 @@
                 {
                     LogRel(("CoreAudio: Failed to start playback (%RI32)\n", err));
-                    return VERR_GENERAL_FAILURE; /** @todo Fudge! */
+                    rc = VERR_GENERAL_FAILURE; /** @todo Fudge! */
                 }
             }
@@ -1576 +1577 @@
             if (drvHostCoreAudioIsRunning(pStreamOut->deviceID))
             {
-                OSStatus err = AudioOutputUnitStop(pStreamOut->audioUnit);
+                err = AudioOutputUnitStop(pStreamOut->audioUnit);
                 if (err != noErr)
                 {
                     LogRel(("CoreAudio: Failed to stop playback (%RI32)\n", err));
-                    return VERR_GENERAL_FAILURE; /** @todo Fudge! */
+                    rc = VERR_GENERAL_FAILURE; /** @todo Fudge! */
+                    break;
                 }
 
@@ -1587 +1589 @@
                 {
                     LogRel(("CoreAudio: Failed to reset AudioUnit (%RI32)\n", err));
-                    return VERR_GENERAL_FAILURE; /** @todo Fudge! */
+                    rc = VERR_GENERAL_FAILURE; /** @todo Fudge! */
                 }
             }
@@ -1598 +1600 @@
     }
 
+    LogFlowFuncLeaveRC(rc);
     return rc;
 }
@@ -1616 +1619 @@
 
     int rc = VINF_SUCCESS;
+    OSStatus err;
 
     switch (enmStreamCmd)
@@ -1621 +1625 @@
         case PDMAUDIOSTREAMCMD_ENABLE:
         {
-            OSStatus err;
-
             /* Only start the device if it is actually stopped */
             if (!drvHostCoreAudioIsRunning(pStreamIn->deviceID))
@@ -1628 +1630 @@
                 RTCircBufReset(pStreamIn->pBuf);
                 err = AudioOutputUnitStart(pStreamIn->audioUnit);
+                if (err != noErr)
+                {
+                    LogRel(("CoreAudio: Failed to start recording (%RI32)\n", err));
+                    rc = VERR_GENERAL_FAILURE; /** @todo Fudge! */
+                    break;
+                }
             }
 
@@ -1643 +1651 @@
             if (drvHostCoreAudioIsRunning(pStreamIn->deviceID))
             {
-                OSStatus err = AudioOutputUnitStop(pStreamIn->audioUnit);
-                if (RT_UNLIKELY(err != noErr))
+                err = AudioOutputUnitStop(pStreamIn->audioUnit);
+                if (err != noErr)
                 {
                     LogRel(("CoreAudio: Failed to stop recording (%RI32)\n", err));
-                    return VERR_GENERAL_FAILURE; /** @todo Fudge! */
+                    rc = VERR_GENERAL_FAILURE; /** @todo Fudge! */
+                    break;
                 }
 
                 err = AudioUnitReset(pStreamIn->audioUnit, kAudioUnitScope_Input, 0);
-                if (RT_UNLIKELY(err != noErr))
+                if (err != noErr)
                 {
                     LogRel(("CoreAudio: Failed to reset AudioUnit (%RI32)\n", err));
-                    return VERR_GENERAL_FAILURE; /** @todo Fudge! */
+                    rc = VERR_GENERAL_FAILURE; /** @todo Fudge! */
+                    break;
                 }
             }
@@ -1665 +1675 @@
     }
 
+    LogFlowFuncLeaveRC(rc);
     return rc;
 }
@@ -1670 +1681 @@
 static DECLCALLBACK(int) drvHostCoreAudioFiniIn(PPDMIHOSTAUDIO pInterface, PPDMAUDIOHSTSTRMIN pHstStrmIn)
 {
-    int rc = 0;
-    OSStatus err = noErr;
-    uint32_t status;
-
     PCOREAUDIOSTREAMIN pStreamIn = (PCOREAUDIOSTREAMIN) pHstStrmIn;
 
@@ -1679 +1686 @@
     PDRVHOSTCOREAUDIO  pThis   = PDMINS_2_DATA(pDrvIns, PDRVHOSTCOREAUDIO);
 
-    LogFlow(("drvHostCoreAudioFiniIn \n"));
-
-    status = ASMAtomicReadU32(&pStreamIn->status);
+    LogFlowFuncEnter();
+
+    uint32_t status = ASMAtomicReadU32(&pStreamIn->status);
     if (!(   status == CA_STATUS_INIT
           || status == CA_STATUS_REINIT))
@@ -1688 +1695 @@
     }
 
-    rc = drvHostCoreAudioControlIn(pInterface, &pStreamIn->streamIn, PDMAUDIOSTREAMCMD_DISABLE);
+    OSStatus err = noErr;
+
+    int rc = drvHostCoreAudioControlIn(pInterface, &pStreamIn->streamIn, PDMAUDIOSTREAMCMD_DISABLE);
     if (RT_SUCCESS(rc))
     {
@@ -1707 +1716 @@
         if (RT_UNLIKELY(err != noErr))
             LogRel(("CoreAudio: Failed to remove the sample rate changed listener (%RI32)\n", err));
+
         if (pStreamIn->converter)
         {
@@ -1727 +1737 @@
             }
             else
+            {
                 LogRel(("CoreAudio: Failed to close the AudioUnit (%RI32)\n", err));
+                rc = VERR_GENERAL_FAILURE; /** @todo Fudge! */
+            }
         }
         else
+        {
             LogRel(("CoreAudio: Failed to uninitialize the AudioUnit (%RI32)\n", err));
+            rc = VERR_GENERAL_FAILURE; /** @todo Fudge! */
+        }
     }
     else
+    {
         LogRel(("CoreAudio: Failed to stop recording (%RI32)\n", err));
-
-    return VINF_SUCCESS;
+        rc = VERR_GENERAL_FAILURE; /** @todo Fudge! */
+    }
+
+    LogFlowFuncLeaveRC(rc);
+    return rc;
 }
 
@@ -1795 +1815 @@
         LogRel(("CoreAudio: Failed to stop playback, rc=%Rrc\n", rc));
 
-    return VINF_SUCCESS;
+    LogFlowFuncLeaveRC(rc);
+    return rc;
 }
 
@@ -1803 +1824 @@
                                                 uint32_t *pcSamples)
 {
-    OSStatus err = noErr;
-    int rc = -1;
+    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->rpos        = 0;
+
     bool fDeviceByUser = false;
 
-    PCOREAUDIOSTREAMIN pStreamIn = (PCOREAUDIOSTREAMIN)pHstStrmIn;
-
-    LogFlow(("drvHostCoreAudioInitIn \n"));
-
-    ASMAtomicXchgU32(&pStreamIn->status, CA_STATUS_UNINIT);
-    pStreamIn->audioUnit = NULL;
-    pStreamIn->deviceID = kAudioDeviceUnknown;
-    pStreamIn->converter = NULL;
-    pStreamIn->sampleRatio = 1;
-    pStreamIn->rpos = 0;
-
-    LogFlow(("drvHostCoreAudioInitIn \n"));
     /* Initialize the hardware info section with the audio settings */
-    drvAudioStreamCfgToProps(pCfg, &pStreamIn->streamIn.Props);
-
+    int rc = drvAudioStreamCfgToProps(pCfg, &pStreamIn->streamIn.Props);
+    if (RT_SUCCESS(rc))
+    {
 #if 0
-    /* Try to find the audio device set by the user */
-    if (DeviceUID.pszInputDeviceUID)
-    {
-        pStreamIn->deviceID = drvHostCoreAudioDeviceUIDtoID(DeviceUID.pszInputDeviceUID);
-        /* Not fatal */
-        if (pStreamIn->deviceID == kAudioDeviceUnknown)
-            LogRel(("CoreAudio: Unable to find input device %s. Falling back to the default audio device. \n", DeviceUID.pszInputDeviceUID));
-        else
-            fDeviceByUser = true;
-    }
+        /* Try to find the audio device set by the user */
+        if (DeviceUID.pszInputDeviceUID)
+        {
+            pStreamIn->deviceID = drvHostCoreAudioDeviceUIDtoID(DeviceUID.pszInputDeviceUID);
+            /* Not fatal */
+            if (pStreamIn->deviceID == kAudioDeviceUnknown)
+                LogRel(("CoreAudio: Unable to find input device %s. Falling back to the default audio device. \n", DeviceUID.pszInputDeviceUID));
+            else
+                fDeviceByUser = true;
+        }
 #endif
-
-    rc = drvHostCoreAudioInitInput(&pStreamIn->streamIn, 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 = { kAudioHardwarePropertyDefaultInputDevice, kAudioObjectPropertyScopeGlobal,
-                                               kAudioObjectPropertyElementMaster };
-        err = AudioObjectAddPropertyListener(kAudioObjectSystemObject, &propAdr,
-                                             drvHostCoreAudioDefaultDeviceChanged, (void *)pStreamIn);
-        /* Not fatal. */
-        if (err != noErr)
-            LogRel(("CoreAudio: Failed to register the default input device changed listener (%RI32)\n", err));
-    }
-
-    return VINF_SUCCESS;
+        rc = drvHostCoreAudioInitInput(&pStreamIn->streamIn, pcSamples);
+    }
+
+    if (RT_SUCCESS(rc))
+    {
+        /* When the devices isn't forced by the user, we want default device change notifications. */
+        if (!fDeviceByUser)
+        {
+            AudioObjectPropertyAddress propAdr = { kAudioHardwarePropertyDefaultInputDevice, kAudioObjectPropertyScopeGlobal,
+                                                   kAudioObjectPropertyElementMaster };
+            OSStatus err = AudioObjectAddPropertyListener(kAudioObjectSystemObject, &propAdr,
+                                                          drvHostCoreAudioDefaultDeviceChanged, (void *)pStreamIn);
+            /* Not fatal. */
+            if (err != noErr)
+                LogRel(("CoreAudio: Failed to register the default input device changed listener (%RI32)\n", err));
+        }
+    }
+
+    LogFlowFuncLeaveRC(rc);
+    return rc;
 }
 
@@ -1864 +1886 @@
     bool fDeviceByUser = false; /* use we a device which was set by the user? */
 
-    LogFlow(("drvHostCoreAudioInitOut\n"));
+    LogFlowFuncEnter();
 
     ASMAtomicXchgU32(&pStreamOut->status, CA_STATUS_UNINIT);
 
     pStreamOut->audioUnit = NULL;
-    pStreamOut->deviceID = kAudioDeviceUnknown;
+    pStreamOut->deviceID  = kAudioDeviceUnknown;
 
     /* Initialize the hardware info section with the audio settings */