Changeset 89220 in vbox

Timestamp:

May 21, 2021 12:16:52 PM (4 years ago)

Author:

vboxsync

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

144562

Message:

DrvHostAudioCoreAudio: Removed PCOREAUDIODEVICEDATA from the stream as we only need it during construction (and then only the UID) and would risk having a stale pointer if enumeration was re-triggered (harmless, as it was never used). bugref:9890

File:

• trunk/src/VBox/Devices/Audio/DrvHostAudioCoreAudio.cpp (modified) (7 diffs)

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

@@ -167 +167 @@
     PCOREAUDIOBUF               paBuffers;
 
-    /** The audio unit for this stream. */
-    struct
-    {
-        /** Pointer to the device this audio unit is bound to.
-         *  Can be NULL if not bound to a device (anymore). */
-        PCOREAUDIODEVICEDATA    pDevice;
-#if 0 /* not used */
-        /** The actual audio unit object. */
-        AudioUnit                   hAudioUnit;
-        /** Stream description for using with VBox:
-         *  - When using this audio unit for input (capturing), this format states
-         *    the unit's output format.
-         *  - When using this audio unit for output (playback), this format states
-         *    the unit's input format. */
-        AudioStreamBasicDescription StreamFmt;
-#endif
-    } Unit;
     /** Initialization status tracker, actually COREAUDIOINITSTATE.
      * Used when some of the device parameters or the device itself is changed
@@ -1459 +1442 @@
      * Do we have a device for the requested stream direction?
      */
-    PCOREAUDIODEVICEDATA pDev = pCfgReq->enmDir == PDMAUDIODIR_IN ? pThis->pDefaultDevIn : pThis->pDefaultDevOut;
+    RTCritSectEnter(&pThis->CritSect);
+    CFStringRef hDevUidStr = NULL;
+    {
+        PCOREAUDIODEVICEDATA pDev = pCfgReq->enmDir == PDMAUDIODIR_IN ? pThis->pDefaultDevIn : pThis->pDefaultDevOut;
+        if (pDev)
+        {
+            Assert(pDev->Core.cbSelf == sizeof(*pDev));
+            hDevUidStr = pDev->UUID;
+            CFRetain(pDev->UUID);
+        }
+    }
+    RTCritSectLeave(&pThis->CritSect);
+
 #ifdef LOG_ENABLED
     char szTmp[PDMAUDIOSTRMCFGTOSTRING_MAX];
 #endif
-    LogFunc(("pDev=%p *pCfgReq: %s\n", pDev, PDMAudioStrmCfgToString(pCfgReq, szTmp, sizeof(szTmp)) ));
-    if (pDev)
-    {
-        Assert(pDev->Core.cbSelf == sizeof(*pDev));
-
+    LogFunc(("hDevUidStr=%p *pCfgReq: %s\n", hDevUidStr, PDMAudioStrmCfgToString(pCfgReq, szTmp, sizeof(szTmp)) ));
+    if (hDevUidStr)
+    {
         /*
          * Basic structure init.
@@ -1477 +1470 @@
         pStreamCA->offInternal      = 0;
         pStreamCA->idxBuffer        = 0;
-        pStreamCA->Unit.pDevice     = pDev;   /** @todo r=bird: How do we protect this against enumeration releasing pDefaultDevOut/In. */
         pStreamCA->enmInitState     = COREAUDIOINITSTATE_IN_INIT;
 
@@ -1519 +1511 @@
                  * Assign device to the queue.
                  */
-                UInt32 uSize = sizeof(pDev->UUID);
-                orc = AudioQueueSetProperty(pStreamCA->hAudioQueue, kAudioQueueProperty_CurrentDevice, &pDev->UUID, uSize);
+                UInt32 uSize = sizeof(hDevUidStr);
+                orc = AudioQueueSetProperty(pStreamCA->hAudioQueue, kAudioQueueProperty_CurrentDevice, &hDevUidStr, uSize);
                 LogFlowFunc(("AudioQueueSetProperty -> %#x\n", orc));
                 if (orc == noErr)
@@ -1610 +1602 @@
 
                             LogFunc(("returns VINF_SUCCESS\n"));
+                            CFRelease(hDevUidStr);
                             return VINF_SUCCESS;
                         }
+
                         RTMemFree(pStreamCA->paBuffers);
                     }
@@ -1627 +1621 @@
         else
             LogRel(("CoreAudio: Failed to initialize critical section for stream: %Rrc\n", rc));
+        CFRelease(hDevUidStr);
     }
     else
@@ -1735 +1730 @@
 
         /*
-         * Release the device and delete the critsect.
+         * Delete the critsect and we're done.
          */
-        pStreamCA->Unit.pDevice = NULL; /** @todo This bugger must be refcounted! */
-
         RTCritSectDelete(&pStreamCA->CritSect);
 
-        /*
-         * Done.
-         */
         ASMAtomicWriteU32(&pStreamCA->enmInitState, COREAUDIOINITSTATE_UNINIT);
     }