Changeset 63927 in vbox for trunk/src/VBox/Devices

Timestamp:

Sep 21, 2016 3:26:08 PM (8 years ago)

Author:

vboxsync

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

110811

Message:

Audio/DrvHostCoreAudio.cpp: Update on Audio Queues (work in progress, not yet enabled by default).

File:

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

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

@@ -1880 +1880 @@
         return VERR_GENERAL_FAILURE; /** @todo Fudge! */
 
+    /* Signal the main thread. */
+    RTThreadUserSignal(RTThreadSelf());
+
     /*
-     * Start the queue.
+     * Enter the main loop.
      */
-    err = AudioQueueStart(pCAStream->audioQueue, NULL);
-
-    RTThreadUserSignal(RTThreadSelf());
-
     const bool fIn = pCAStream->enmDir == PDMAUDIODIR_IN;
 
@@ -1894 +1893 @@
     }
 
+    /*
+     * Cleanup.
+     */
     if (fIn)
     {
@@ -1919 +1921 @@
                                   UInt32 cPacketDesc, const AudioStreamPacketDescription *paPacketDesc)
 {
-    RT_NOREF(pAudioTS, cPacketDesc, paPacketDesc);
+    RT_NOREF(audioQueue, pAudioTS, cPacketDesc, paPacketDesc);
 
     PCOREAUDIOSTREAM pCAStream = (PCOREAUDIOSTREAM)pvUser;
@@ -1947 +1949 @@
             RTCircBufAcquireWriteBlock(pCircBuf, cbLeft, (void **)&pvDst, &cbToWrite);
 
+            if (!cbToWrite)
+                break;
+
             /* Copy the data from our ring buffer to the core audio buffer. */
             memcpy((UInt8 *)pvDst + cbWritten, pvSrc + cbWritten, cbToWrite);
 
             /* Release the read buffer, so it could be used for new data. */
-            RTCircBufReleaseReadBlock(pCircBuf, cbToWrite);
+            RTCircBufReleaseWriteBlock(pCircBuf, cbToWrite);
 
             cbWritten += cbToWrite;
@@ -1960 +1965 @@
     }
 
-    if (cbWritten)
-    {
-        OSStatus err = AudioQueueEnqueueBuffer(audioQueue, audioBuffer, 0, NULL);
-        if (err != noErr)
-            LogFunc(("Failed writing %zu bytes\n", cbWritten));
-    }
-
-    LogFunc(("pCAStream=%p, fRunning=%RTbool, cbWritten=%zu\n", pCAStream, fRunning, cbWritten));
-
     rc = RTCritSectLeave(&pCAStream->CritSect);
     AssertRC(rc);
+
+    audioBuffer->mAudioDataByteSize = cbWritten;
+
+    AudioQueueEnqueueBuffer(pCAStream->audioQueue, audioBuffer, 0, NULL);
+
+    Log3Func(("pCAStream=%p, fRunning=%RTbool, cbWritten=%zu\n", pCAStream, fRunning, cbWritten));
 }
 
 static void coreAudioOutputQueueCb(void *pvUser, AudioQueueRef audioQueue, AudioQueueBufferRef audioBuffer)
 {
+    RT_NOREF(audioQueue);
+
     PCOREAUDIOSTREAM pCAStream = (PCOREAUDIOSTREAM)pvUser;
     AssertPtr(pCAStream);
@@ -2030 +2034 @@
     }
 
-    AudioQueueEnqueueBuffer(audioQueue, audioBuffer, 0, NULL);
-
-    LogFunc(("pCAStream=%p, fRunning=%RTbool, cbCapacity=%RU32, cbRead=%zu\n",
-             pCAStream, fRunning, audioBuffer->mAudioDataBytesCapacity, cbRead));
+    AudioQueueEnqueueBuffer(pCAStream->audioQueue, audioBuffer, 0, NULL);
+
+    Log3Func(("pCAStream=%p, fRunning=%RTbool, cbCapacity=%RU32, cbRead=%zu\n",
+              pCAStream, fRunning, audioBuffer->mAudioDataBytesCapacity, cbRead));
 
     rc = RTCritSectLeave(&pCAStream->CritSect);
@@ -2064 +2068 @@
                        : "Playback queue format", &pCAStream->asbdAcq);
 
-    rc = RTCircBufCreate(&pCAStream->pCircBuf, 4096 << 1 /*pHstStrmIn->Props.cShift*/); /** @todo FIX THIS !!! */
+    rc = RTCircBufCreate(&pCAStream->pCircBuf, 8096 << 1 /*pHstStrmIn->Props.cShift*/); /** @todo FIX THIS !!! */
     if (RT_FAILURE(rc))
         return rc;
@@ -3128 +3132 @@
     uint32_t cbWrittenTotal = 0;
 
+#ifdef VBOX_WITH_AUDIO_CA_QUEUES
+    rc = RTCritSectEnter(&pCAStream->CritSect);
+    AssertRC(rc);
+#endif
+
     do
     {
@@ -3135 +3144 @@
         uint32_t cWritten, cbWritten;
         uint8_t *puBuf;
-        size_t   cbToRead;
+        size_t   cbToRead = 0;
 
         Log3Func(("cbMixBuf=%zu, cbToWrite=%zu/%zu\n", cbMixBuf, cbToWrite, RTCircBufSize(pCAStream->pCircBuf)));
@@ -3144 +3153 @@
             RTCircBufAcquireReadBlock(pCAStream->pCircBuf, cbToWrite, (void **)&puBuf, &cbToRead);
             if (!cbToRead)
-            {
-                RTCircBufReleaseReadBlock(pCAStream->pCircBuf, cbToRead);
                 break;
-            }
 
 #ifdef DEBUG_DUMP_PCM_DATA
@@ -3169 +3175 @@
                 || !cWritten)
             {
-                RTCircBufReleaseReadBlock(pCAStream->pCircBuf, cbToRead);
                 break;
             }
@@ -3183 +3188 @@
     }
     while (0);
+
+#ifdef VBOX_WITH_AUDIO_CA_QUEUES
+    int rc2 = RTCritSectLeave(&pCAStream->CritSect);
+    AssertRC(rc2);
+#endif
 
     if (RT_SUCCESS(rc))
@@ -3340 +3350 @@
             LogFunc(("Queue enable/resume\n"));
             ASMAtomicXchgBool(&pCAStream->fRunning, true);
+
+            AudioQueueStart(pCAStream->audioQueue, NULL);
 #else
             /* Only start the device if it is actually stopped */
@@ -3370 +3382 @@
             LogFunc(("Queue disable/pause\n"));
             ASMAtomicXchgBool(&pCAStream->fRunning, false);
+
+            AudioQueuePause(pCAStream->audioQueue);
 #else
             /* Only stop the device if it is actually running */
@@ -3559 +3573 @@
 
             rc = coreAudioStreamInitQueue(pCAStream, pCfgReq, pCfgAcq);
+
+            pCfgAcq->cSampleBufferSize = _4K; /** @todo FIX THIS !!! */
 #else
             if (fIn)