Changeset 65435 in vbox for trunk/src/VBox

Timestamp:

Jan 24, 2017 4:53:55 PM (8 years ago)

Author:

vboxsync

Message:

VideoRec: Got rid of busy waiting and unnecessary termination event; more audio work.

Location:

trunk/src/VBox/Main/src-client

Files:

• EbmlWriter.cpp (modified) (2 diffs)
• EbmlWriter.h (modified) (1 diff)
• VideoRec.cpp (modified) (22 diffs)
• VideoRec.h (modified) (1 diff)

trunk/src/VBox/Main/src-client/EbmlWriter.cpp

@@ -585 +585 @@
         CurSeg.mapTracks[uTrack] = pTrack;
 
-        Assert(uTrack == 0);
-
         if (puTrack)
             *puTrack = uTrack;
@@ -784 +782 @@
         uint64_t tcPTSRaw = lround((CurSeg.uTimecodeScaleFactor * 1000 * Cluster.cbData) / a_pTrack->Audio.uHz);
 
-        uint64_t tcPTS = /*Cluster.tcStart +*/ lround(tcPTSRaw / CurSeg.uTimecodeScaleFactor);
+        /* Calculate the absolute PTS. */
+        uint64_t tcPTS = lround(tcPTSRaw / CurSeg.uTimecodeScaleFactor);
 
         if (Cluster.tcStart == UINT64_MAX)

trunk/src/VBox/Main/src-client/EbmlWriter.h

@@ -82 +82 @@
         /** Size (in bytes) of encoded Opus audio data. */
         size_t      cbData;
+        /** Timestamp (in ms). */
+        uint64_t    uTimestampMs;
     };
 #endif /* VBOX_WITH_LIBOPUS */

trunk/src/VBox/Main/src-client/VideoRec.cpp

@@ -60 +60 @@
     /** Currently busy, delay termination. */
     VIDEORECSTS_BUSY          = 2,
-    /** Signal that we are terminating. */
-    VIDEORECSTS_TERMINATING   = 3
+    /** The usual 32-bit hack. */
+    VIDEORECSTS_32BIT_HACK    = 0x7fffffff
 };
 
@@ -78 +78 @@
     VIDEORECPIXELFMT_RGB565  = 3
 };
-
-/* Must be always accessible and therefore cannot be part of VIDEORECCONTEXT */
-static uint32_t g_enmState = VIDEORECSTS_UNINITIALIZED; /** @todo r=andy Make this part of VIDEORECCONTEXT + remove busy waiting. */
 
 /**
@@ -153 +150 @@
 } VIDEORECSTREAM, *PVIDEORECSTREAM;
 
+#ifdef VBOX_WITH_AUDIO_VIDEOREC
+typedef struct VIDEORECAUDIOFRAME
+{
+    uint8_t             abBuf[_64K]; /** @todo Fix! */
+    uint32_t            cbBuf;
+    /** Time stamp (in ms). */
+    uint64_t            uTimeStampMs;
+} VIDEORECAUDIOFRAME, *PVIDEORECAUDIOFRAME;
+#endif
+
 /** Vector of video recording streams. */
 typedef std::vector <PVIDEORECSTREAM> VideoRecStreams;
@@ -161 +168 @@
 typedef struct VIDEORECCONTEXT
 {
+    /** The current state. */
+    uint32_t            enmState;
     /** Semaphore to signal the encoding worker thread. */
     RTSEMEVENT          WaitEvent;
-    /** Semaphore required during termination. */
-    RTSEMEVENT          TermEvent;
     /** Whether video recording is enabled or not. */
     bool                fEnabled;
+    /** Shutdown indicator. */
+    bool                fShutdown;
     /** Worker thread. */
     RTTHREAD            Thread;
@@ -177 +186 @@
 #ifdef VBOX_WITH_AUDIO_VIDEOREC
     bool                fHasAudioData;
-    struct
-    {
-        uint8_t         buf[_64K];
-    } Audio;
+    VIDEORECAUDIOFRAME  Audio;
 #endif
 } VIDEORECCONTEXT, *PVIDEORECCONTEXT;
@@ -455 +461 @@
 static DECLCALLBACK(int) videoRecThread(RTTHREAD hThreadSelf, void *pvUser)
 {
-    RT_NOREF(hThreadSelf);
     PVIDEORECCONTEXT pCtx = (PVIDEORECCONTEXT)pvUser;
+
+    /* Signal that we're up and rockin'. */
+    RTThreadUserSignal(hThreadSelf);
 
     for (;;)
@@ -463 +471 @@
         AssertRCBreak(rc);
 
-        if (ASMAtomicReadU32(&g_enmState) == VIDEORECSTS_TERMINATING)
+        if (ASMAtomicReadBool(&pCtx->fShutdown))
             break;
 
@@ -503 +511 @@
             if (fHasAudioData)
             {
-                WebMWriter::BlockData_Opus blockData = { pCtx->Audio.buf,  };
+                WebMWriter::BlockData_Opus blockData = { pCtx->Audio.abBuf, pCtx->Audio.cbBuf, pCtx->Audio.uTimeStampMs };
                 rc = pStream->pEBML->WriteBlock(pStream->uTrackAudio, &blockData, sizeof(blockData));
             }
@@ -529 +537 @@
     AssertPtrReturn(ppCtx, VERR_INVALID_POINTER);
 
-    Assert(ASMAtomicReadU32(&g_enmState) == VIDEORECSTS_UNINITIALIZED);
-
     int rc = VINF_SUCCESS;
 
@@ -563 +569 @@
     if (RT_SUCCESS(rc))
     {
+        pCtx->enmState  = VIDEORECSTS_UNINITIALIZED;
+        pCtx->fShutdown = false;
+
         rc = RTSemEventCreate(&pCtx->WaitEvent);
         AssertRCReturn(rc, rc);
 
-        rc = RTSemEventCreate(&pCtx->TermEvent);
-        AssertRCReturn(rc, rc);
-
-        rc = RTThreadCreate(&pCtx->Thread, videoRecThread, (void*)pCtx, 0,
+        rc = RTThreadCreate(&pCtx->Thread, videoRecThread, (void *)pCtx, 0,
                             RTTHREADTYPE_MAIN_WORKER, RTTHREADFLAGS_WAITABLE, "VideoRec");
-        AssertRCReturn(rc, rc);
-
-        ASMAtomicWriteU32(&g_enmState, VIDEORECSTS_IDLE);
-
-        if (ppCtx)
-            *ppCtx = pCtx;
-    }
-    else
+
+        if (RT_SUCCESS(rc)) /* Wait for the thread to start. */
+            rc = RTThreadUserWait(pCtx->Thread, 30 * 1000 /* 30s timeout */);
+
+        if (RT_SUCCESS(rc))
+        {
+            pCtx->enmState = VIDEORECSTS_IDLE;
+            pCtx->fEnabled = true;
+
+            if (ppCtx)
+                *ppCtx = pCtx;
+        }
+    }
+
+    if (RT_FAILURE(rc))
     {
         /* Roll back allocations on error. */
@@ -606 +619 @@
  * @param pCtx                  Video recording context to destroy.
  */
-void VideoRecContextDestroy(PVIDEORECCONTEXT pCtx)
+int VideoRecContextDestroy(PVIDEORECCONTEXT pCtx)
 {
     if (!pCtx)
-        return;
-
-    uint32_t enmState = VIDEORECSTS_IDLE;
-
-    for (;;) /** @todo r=andy Remove busy waiting! */
-    {
-        if (ASMAtomicCmpXchgExU32(&g_enmState, VIDEORECSTS_TERMINATING, enmState, &enmState))
-            break;
-        if (enmState == VIDEORECSTS_UNINITIALIZED)
-            return;
-    }
-
-    if (enmState == VIDEORECSTS_BUSY)
-    {
-        int rc = RTSemEventWait(pCtx->TermEvent, RT_INDEFINITE_WAIT);
-        AssertRC(rc);
-    }
-
+        return VINF_SUCCESS;
+
+    /* Set shutdown indicator. */
+    ASMAtomicWriteBool(&pCtx->fShutdown, true);
+
+    /* Signal the thread. */
     RTSemEventSignal(pCtx->WaitEvent);
-    RTThreadWait(pCtx->Thread, 10 * 1000, NULL);
-    RTSemEventDestroy(pCtx->WaitEvent);
-    RTSemEventDestroy(pCtx->TermEvent);
+
+    int rc = RTThreadWait(pCtx->Thread, 10 * 1000 /* 10s timeout */, NULL);
+    if (RT_FAILURE(rc))
+        return rc;
+
+    rc = RTSemEventDestroy(pCtx->WaitEvent);
+    AssertRC(rc);
+
+    pCtx->WaitEvent = NIL_RTSEMEVENT;
 
     VideoRecStreams::iterator it = pCtx->vecStreams.begin();
@@ -668 +675 @@
 
     Assert(pCtx->vecStreams.empty());
+
     RTMemFree(pCtx);
-
-    ASMAtomicWriteU32(&g_enmState, VIDEORECSTS_UNINITIALIZED);
+    pCtx = NULL;
+
+    return VINF_SUCCESS;
 }
 
@@ -885 +894 @@
     pStream->Video.pu8YuvBuf = pStream->Codec.VPX.RawImage.planes[0];
 #endif
-
-    pCtx->fEnabled = true;
     pStream->fEnabled = true;
 
@@ -895 +902 @@
  * VideoRec utility function to check if recording is enabled.
  *
- * @returns true if recording is enabled
+ * @returns true if recording is enabled.
  * @param   pCtx                Pointer to video recording context.
  */
@@ -901 +908 @@
 {
     RT_NOREF(pCtx);
-    uint32_t enmState = ASMAtomicReadU32(&g_enmState);
+    uint32_t enmState = ASMAtomicReadU32(&pCtx->enmState);
     return (   enmState == VIDEORECSTS_IDLE
             || enmState == VIDEORECSTS_BUSY);
@@ -910 +917 @@
  * for the given screen.
  *
- * @returns true if recording engine is ready
+ * @returns true if recording engine is ready.
  * @param   pCtx                Pointer to video recording context.
  * @param   uScreen             Screen ID.
@@ -917 +924 @@
 bool VideoRecIsReady(PVIDEORECCONTEXT pCtx, uint32_t uScreen, uint64_t uTimeStampMs)
 {
-    uint32_t enmState = ASMAtomicReadU32(&g_enmState);
+    uint32_t enmState = ASMAtomicReadU32(&pCtx->enmState);
     if (enmState != VIDEORECSTS_IDLE)
         return false;
@@ -931 +938 @@
         return false;
 
-    if (ASMAtomicReadBool(&pStream->fHasVideoData))
+    if (   ASMAtomicReadBool(&pStream->fHasVideoData)
+#ifdef VBOX_WITH_AUDIO_VIDEOREC
+        /* Check if we have audio data left for the current frame. */
+        || ASMAtomicReadBool(&pCtx->fHasAudioData)
+#endif
+       )
+    {
         return false;
+    }
 
     return true;
@@ -1083 +1097 @@
  * @param   pvData              Audio frame data to send.
  * @param   cbData              Size (in bytes) of audio frame data.
- * @param   uTimestampMs        Time stamp (in ms) of audio playback.
- */
-int VideoRecSendAudioFrame(PVIDEORECCONTEXT pCtx, const void *pvData, size_t cbData, uint64_t uTimestampMs)
-{
-    RT_NOREF(pCtx, pvData, cbData, uTimestampMs);
+ * @param   uTimeStampMs        Time stamp (in ms) of audio playback.
+ */
+int VideoRecSendAudioFrame(PVIDEORECCONTEXT pCtx, const void *pvData, size_t cbData, uint64_t uTimeStampMs)
+{
+#ifdef VBOX_WITH_AUDIO_VIDEOREC
+    AssertReturn(cbData <= _64K, VERR_INVALID_PARAMETER);
+
+    /* Do not execute during termination and guard against termination. */
+    if (!ASMAtomicCmpXchgU32(&pCtx->enmState, VIDEORECSTS_BUSY, VIDEORECSTS_IDLE))
+        return VINF_TRY_AGAIN;
 
     /* To save time spent in EMT, do the required audio multiplexing in the encoding thread.
@@ -1095 +1114 @@
      */
 
-
+    if (ASMAtomicReadBool(&pCtx->fHasAudioData))
+        return VERR_TRY_AGAIN; /* Previous frame not yet encoded. */
+
+    memcpy(pCtx->Audio.abBuf, pvData, RT_MIN(_64K, cbData));
+    pCtx->Audio.uTimeStampMs = uTimeStampMs;
+
+    ASMAtomicWriteBool(&pCtx->fHasAudioData, true);
+    RTSemEventSignal(pCtx->WaitEvent);
+#else
+    RT_NOREF(pCtx, pvData, cbData, uTimeStampMs);
+#endif
     return VINF_SUCCESS;
 }
@@ -1124 +1153 @@
 {
     /* Do not execute during termination and guard against termination. */
-    if (!ASMAtomicCmpXchgU32(&g_enmState, VIDEORECSTS_BUSY, VIDEORECSTS_IDLE))
+    if (!ASMAtomicCmpXchgU32(&pCtx->enmState, VIDEORECSTS_BUSY, VIDEORECSTS_IDLE))
         return VINF_TRY_AGAIN;
 
@@ -1270 +1299 @@
     } while (0);
 
-    if (!ASMAtomicCmpXchgU32(&g_enmState, VIDEORECSTS_IDLE, VIDEORECSTS_BUSY))
-    {
-        rc = RTSemEventSignal(pCtx->TermEvent);
-        AssertRC(rc);
-    }
+    ASMAtomicCmpXchgU32(&pCtx->enmState, VIDEORECSTS_IDLE, VIDEORECSTS_BUSY);
 
     return rc;

trunk/src/VBox/Main/src-client/VideoRec.h

@@ -25 +25 @@
 typedef struct VIDEORECSTREAM *PVIDEORECSTREAM;
 
-int  VideoRecContextCreate(uint32_t cScreens, PVIDEORECCONTEXT *ppCtx);
-void VideoRecContextDestroy(PVIDEORECCONTEXT pCtx);
+int VideoRecContextCreate(uint32_t cScreens, PVIDEORECCONTEXT *ppCtx);
+int VideoRecContextDestroy(PVIDEORECCONTEXT pCtx);
 
 int  VideoRecStreamInit(PVIDEORECCONTEXT pCtx, uint32_t uScreen, const char *pszFile,