Changeset 64171 in vbox for trunk/src/VBox

Timestamp:

Oct 6, 2016 4:26:14 PM (8 years ago)

Author:

vboxsync

Message:

Audio/DrvHostCoreAudio.cpp: Update on Audio Queues.

File:

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

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

@@ -57 +57 @@
 /** @todo Needs more investigation and testing first before enabling. */
 //# define VBOX_WITH_AUDIO_CA_CONVERTER
-
-#ifdef DEBUG_andy
-/** Enables support for Audio Queues. */
-# define VBOX_WITH_AUDIO_CA_QUEUES
-#endif
 
 #ifdef DEBUG_andy
@@ -477 +472 @@
 typedef struct COREAUDIOSTREAM
 {
-    /** Host input stream.
+    /** PDM audio stream data.
      *  Note: Always must come first in this structure! */
-    PDMAUDIOSTREAM          Stream;
-    /** Note: This *always* must come first! */
+    PDMAUDIOSTREAM              Stream;
+    /** Stream-specific data, depending on the stream type. */
     union
     {
-        COREAUDIOSTREAMIN   In;
-        COREAUDIOSTREAMOUT  Out;
+        COREAUDIOSTREAMIN       In;
+        COREAUDIOSTREAMOUT      Out;
     };
     /** List node for the device's stream list. */
-    RTLISTNODE              Node;
+    RTLISTNODE                  Node;
     /** Pointer to driver instance this stream is bound to. */
-    PDRVHOSTCOREAUDIO       pDrv;
+    PDRVHOSTCOREAUDIO           pDrv;
     /** The stream's direction. */
-    PDMAUDIODIR             enmDir;
+    PDMAUDIODIR                 enmDir;
 #ifdef VBOX_WITH_AUDIO_CA_QUEUES
     /** The stream's thread handle for maintaining the audio queue. */
-    RTTHREAD                hThread;
+    RTTHREAD                    hThread;
     /** Flag indicating to start a stream's data processing. */
-    bool                    fRun;
+    bool                        fRun;
     /** Whether the stream is in a running (active) state or not.
      *  For playback streams this means that audio data can be (or is being) played,
      *  for capturing streams this means that audio data is being captured (if available). */
-    bool                    fIsRunning;
+    bool                        fIsRunning;
     /** Thread shutdown indicator. */
-    bool                    fShutdown;
+    bool                        fShutdown;
     /** Critical section for serializing access between thread + callbacks. */
-    RTCRITSECT              CritSect;
+    RTCRITSECT                  CritSect;
     /** The actual audio queue being used. */
-    AudioQueueRef           audioQueue;
+    AudioQueueRef               audioQueue;
     /** The audio buffers which are used with the above audio queue. */
-    AudioQueueBufferRef     audioBuffer[3];
-    AudioStreamBasicDescription asbdAcq;
+    AudioQueueBufferRef         audioBuffer[3];
+    /** The acquired (final) audio format for this stream. */
+    AudioStreamBasicDescription asbdStream;
 #endif
     /** The audio unit for this stream. */
-    COREAUDIOUNIT           Unit;
+    COREAUDIOUNIT               Unit;
     /** Initialization status tracker. Used when some of the device parameters
      *  or the device itself is changed during the runtime. */
-    volatile uint32_t       enmStatus;
+    volatile uint32_t           enmStatus;
     /** An internal ring buffer for transferring data from/to the rendering callbacks. */
-    PRTCIRCBUF              pCircBuf;
+    PRTCIRCBUF                  pCircBuf;
 } COREAUDIOSTREAM, *PCOREAUDIOSTREAM;
 
@@ -1847 +1843 @@
     OSStatus err;
     if (pCAStream->enmDir == PDMAUDIODIR_IN)
-        err = AudioQueueNewInput(&pCAStream->asbdAcq, coreAudioInputQueueCb, pCAStream /* pvData */,
+        err = AudioQueueNewInput(&pCAStream->asbdStream, coreAudioInputQueueCb, pCAStream /* pvData */,
                                  CFRunLoopGetCurrent(), kCFRunLoopDefaultMode, 0, &pCAStream->audioQueue);
     else
-        err = AudioQueueNewOutput(&pCAStream->asbdAcq, coreAudioOutputQueueCb, pCAStream /* pvData */,
+        err = AudioQueueNewOutput(&pCAStream->asbdStream, coreAudioOutputQueueCb, pCAStream /* pvData */,
                                   CFRunLoopGetCurrent(), kCFRunLoopDefaultMode, 0, &pCAStream->audioQueue);
 
@@ -2143 +2139 @@
 
     /* Create the recording device's out format based on our required audio settings. */
-    int rc = coreAudioStreamCfgToASBD(pCfgReq, &pCAStream->asbdAcq);
+    int rc = coreAudioStreamCfgToASBD(pCfgReq, &pCAStream->asbdStream);
     if (RT_FAILURE(rc))
     {
@@ -2153 +2149 @@
     coreAudioPrintASBD(  fIn
                        ? "Capturing queue format"
-                       : "Playback queue format", &pCAStream->asbdAcq);
+                       : "Playback queue format", &pCAStream->asbdStream);
 
     rc = RTCircBufCreate(&pCAStream->pCircBuf, 8096 << 1 /*pHstStrmIn->Props.cShift*/); /** @todo FIX THIS !!! */
@@ -3242 +3238 @@
 
         uint32_t csWritten, cbWritten;
-        uint8_t *puBuf;
+
+        uint8_t *pvChunk;
+        size_t   cbChunk;
 
         Log3Func(("cbMixBuf=%zu, cbToWrite=%zu/%zu\n", cbMixBuf, cbToWrite, RTCircBufSize(pCAStream->pCircBuf)));
@@ -3249 +3247 @@
         {
             /* Try to acquire the necessary block from the ring buffer. */
-            size_t cbChunk;
-            RTCircBufAcquireReadBlock(pCAStream->pCircBuf, cbToWrite, (void **)&puBuf, &cbChunk);
+            RTCircBufAcquireReadBlock(pCAStream->pCircBuf, cbToWrite, (void **)&pvChunk, &cbChunk);
             if (cbChunk)
             {
@@ -3259 +3256 @@
                 if (RT_SUCCESS(rc))
                 {
-                    RTFileWrite(fh, puBuf, cbChunk, NULL);
+                    RTFileWrite(fh, pvChunk, cbChunk, NULL);
                     RTFileClose(fh);
                 }
@@ -3265 +3262 @@
                     AssertFailed();
 #endif
-                rc = AudioMixBufWriteCirc(&pStream->MixBuf, puBuf, cbChunk, &csWritten);
+                rc = AudioMixBufWriteCirc(&pStream->MixBuf, pvChunk, cbChunk, &csWritten);
                 if (rc == VERR_BUFFER_OVERFLOW)
                 {
@@ -3296 +3293 @@
 #ifdef LOG_ENABLED
     uint32_t cbWrittenTotal = AUDIOMIXBUF_S2B(&pStream->MixBuf, csWrittenTotal);
-#endif
     Log3Func(("csWrittenTotal=%RU32 (%RU32 bytes), rc=%Rrc\n", csWrittenTotal, cbWrittenTotal, rc));
+#endif
 
     if (RT_SUCCESS(rc))
@@ -3377 +3374 @@
     Log3Func(("cbLive=%zu, cbToRead=%zu\n", cbLive, cbToRead));
 
+    uint8_t *pvChunk;
+    size_t   cbChunk;
+
     while (cbToRead)
     {
         uint32_t cRead, cbRead;
-        uint8_t *puBuf;
-        size_t   cbCopy;
 
         /* Try to acquire the necessary space from the ring buffer. */
-        RTCircBufAcquireWriteBlock(pCAStream->pCircBuf, cbToRead, (void **)&puBuf, &cbCopy);
-        if (!cbCopy)
-        {
-            RTCircBufReleaseWriteBlock(pCAStream->pCircBuf, cbCopy);
+        RTCircBufAcquireWriteBlock(pCAStream->pCircBuf, cbToRead, (void **)&pvChunk, &cbChunk);
+        if (!cbChunk)
+        {
+            RTCircBufReleaseWriteBlock(pCAStream->pCircBuf, cbChunk);
             break;
         }
 
-        Assert(cbCopy <= cbToRead);
-
-        rc = AudioMixBufReadCirc(&pStream->MixBuf, puBuf, cbCopy, &cRead);
-        if (   RT_FAILURE(rc)
-            || !cRead)
-        {
-            RTCircBufReleaseWriteBlock(pCAStream->pCircBuf, 0);
+        Assert(cbChunk <= cbToRead);
+
+        rc = AudioMixBufReadCirc(&pStream->MixBuf, pvChunk, cbChunk, &cRead);
+
+        cbRead = AUDIOMIXBUF_S2B(&pStream->MixBuf, cRead);
+
+        /* Release the ring buffer, so the read thread could start reading this data. */
+        RTCircBufReleaseWriteBlock(pCAStream->pCircBuf, cbChunk);
+
+        if (RT_FAILURE(rc))
             break;
-        }
-
-        cbRead = AUDIOMIXBUF_S2B(&pStream->MixBuf, cRead);
-
-        /* Release the ring buffer, so the read thread could start reading this data. */
-        RTCircBufReleaseWriteBlock(pCAStream->pCircBuf, cbRead);
 
         Assert(cbToRead >= cbRead);
@@ -3511 +3506 @@
 
         case PDMAUDIOSTREAMCMD_DISABLE:
-        {
 #ifdef VBOX_WITH_AUDIO_CA_QUEUES
+        {
             LogFunc(("Queue disable\n"));
             AudioQueueStop(pCAStream->audioQueue, 1 /* Immediately */);
             ASMAtomicXchgBool(&pCAStream->fRun,       false);
             ASMAtomicXchgBool(&pCAStream->fIsRunning, false);
-#endif
             break;
         }
-
+#endif
         case PDMAUDIOSTREAMCMD_PAUSE:
         {
@@ -3713 +3707 @@
         if (RT_SUCCESS(rc))
         {
+            ASMAtomicXchgU32(&pCAStream->enmStatus, COREAUDIOSTATUS_IN_INIT);
+
 #ifdef VBOX_WITH_AUDIO_CA_QUEUES
-            ASMAtomicXchgU32(&pCAStream->enmStatus, COREAUDIOSTATUS_IN_INIT);
-
             rc = coreAudioStreamInitQueue(pCAStream, pCfgReq, pCfgAcq);
-
-            pCfgAcq->cSampleBufferSize = _4K; /** @todo FIX THIS !!! */
+            if (RT_SUCCESS(rc))
+            {
+                pCfgAcq->cSampleBufferSize = _4K; /** @todo FIX THIS !!! */
+            }
 #else
             if (fIn)