Changeset 65429 in vbox for trunk/src/VBox/Main

Timestamp:

Jan 24, 2017 3:35:58 PM (8 years ago)

Author:

vboxsync

Message:

VideoRec: Update.

Location:

trunk/src/VBox/Main/src-client

Files:

• DrvAudioVideoRec.cpp (modified) (5 diffs)
• VideoRec.cpp (modified) (22 diffs)
• VideoRec.h (modified) (1 diff)

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

@@ -543 +543 @@
  */
 static DECLCALLBACK(int) drvAudioVideoRecStreamPlay(PPDMIHOSTAUDIO pInterface,
-                                                    PPDMAUDIOSTREAM pStream, const void *pvBuf2, uint32_t cbBuf2,
+                                                    PPDMAUDIOSTREAM pStream, const void *pvBuf, uint32_t cbBuf,
                                                     uint32_t *pcbWritten)
 {
-    RT_NOREF2(pvBuf2, cbBuf2);
-
     AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
     AssertPtrReturn(pStream,    VERR_INVALID_POINTER);
@@ -555 +553 @@
     RT_NOREF(pThis);
     PAVRECSTREAMOUT   pStreamOut = (PAVRECSTREAMOUT)pStream;
+
+    RT_NOREF(pvBuf, cbBuf);
 
     uint32_t csLive = AudioMixBufUsed(&pStream->MixBuf);
@@ -578 +578 @@
     AssertPtr(pCircBuf);
 
-    void  *pvBuf;
-    size_t cbBuf;
+    void  *pvCircBuf;
+    size_t cbCircBuf;
 
     /*
@@ -586 +586 @@
     while (RTCircBufFree(pCircBuf))
     {
-        RTCircBufAcquireWriteBlock(pCircBuf, RTCircBufFree(pCircBuf), &pvBuf, &cbBuf);
+        RTCircBufAcquireWriteBlock(pCircBuf, RTCircBufFree(pCircBuf), &pvCircBuf, &cbCircBuf);
 
         uint32_t cbRead = 0;
 
-        if (cbBuf)
+        if (cbCircBuf)
         {
             uint32_t csRead = 0;
-            rc = AudioMixBufReadCirc(&pStream->MixBuf, pvBuf, cbBuf, &csRead);
+            rc = AudioMixBufReadCirc(&pStream->MixBuf, pvCircBuf, cbCircBuf, &csRead);
             if (   RT_SUCCESS(rc)
                 && csRead)
@@ -630 +630 @@
         while (cbSrc < cbFrame)
         {
-            RTCircBufAcquireReadBlock(pCircBuf, cbFrame - cbSrc, &pvBuf, &cbBuf);
-
-            if (cbBuf)
+            RTCircBufAcquireReadBlock(pCircBuf, cbFrame - cbSrc, &pvCircBuf, &cbCircBuf);
+
+            if (cbCircBuf)
             {
-                memcpy(&abSrc[cbSrc], pvBuf, cbBuf);
-
-                cbSrc += cbBuf;
+                memcpy(&abSrc[cbSrc], pvCircBuf, cbCircBuf);
+
+                cbSrc += cbCircBuf;
                 Assert(cbSrc <= sizeof(abSrc));
             }
 
-            RTCircBufReleaseReadBlock(pCircBuf, cbBuf);
-
-            if (!cbBuf)
+            RTCircBufReleaseReadBlock(pCircBuf, cbCircBuf);
+
+            if (!cbCircBuf)
                 break;
         }

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

@@ -127 +127 @@
     uint64_t            uCurTimeStampMs;
 
+    /** Whether the RGB buffer is filled or not. */
+    bool                fHasVideoData;
+
     struct
     {
@@ -137 +140 @@
         /** Y resolution of the last encoded frame. */
         uint32_t            uSrcLastHeight;
-        /** Current frame number. */
-        uint64_t            cFrame;
-        /** RGB buffer containing the most recent frame of the framebuffer. */
+        /** RGB buffer containing the most recent frame of Main's framebuffer. */
         uint8_t            *pu8RgbBuf;
         /** YUV buffer the encode function fetches the frame from. */
         uint8_t            *pu8YuvBuf;
-        /** Whether the RGB buffer is filled or not. */
-        bool                fRgbFilled;
         /** Pixel format of the current frame. */
         uint32_t            uPixelFormat;
-        /** Minimal delay between two frames. */
-        uint32_t            uDelay;
+        /** Minimal delay (in ms) between two frames. */
+        uint32_t            uDelayMs;
         /** Encoder deadline. */
         unsigned int        uEncoderDeadline;
     } Video;
-
 } VIDEORECSTREAM, *PVIDEORECSTREAM;
 
@@ -177 +175 @@
     /** Vector of current video recording stream contexts. */
     VideoRecStreams     vecStreams;
+#ifdef VBOX_WITH_AUDIO_VIDEOREC
+    bool                fHasAudioData;
+    struct
+    {
+        uint8_t         buf[_64K];
+    } Audio;
+#endif
 } VIDEORECCONTEXT, *PVIDEORECCONTEXT;
 
@@ -461 +466 @@
             break;
 
+#ifdef VBOX_WITH_AUDIO_VIDEOREC
+        const bool fHasAudioData = ASMAtomicReadBool(&pCtx->fHasAudioData);
+#endif
+        /** @todo r=andy This is inefficient -- as we already wake up this thread
+         *               for every screen from Main, we here go again (on every wake up) through
+         *               all screens.  */
         for (VideoRecStreams::iterator it = pCtx->vecStreams.begin(); it != pCtx->vecStreams.end(); it++)
         {
             PVIDEORECSTREAM pStream = (*it);
 
-            if (   pStream->fEnabled
-                && ASMAtomicReadBool(&pStream->Video.fRgbFilled))
+            if (!pStream->fEnabled)
+                continue;
+
+            if (ASMAtomicReadBool(&pStream->fHasVideoData))
             {
                 rc = videoRecRGBToYUV(pStream);
 
-                ASMAtomicWriteBool(&pStream->Video.fRgbFilled, false);
+                ASMAtomicWriteBool(&pStream->fHasVideoData, false);
 
                 if (RT_SUCCESS(rc))
@@ -485 +498 @@
                 }
             }
-        }
+
+#ifdef VBOX_WITH_AUDIO_VIDEOREC
+            /* Each (enabled) screen has to get the audio data. */
+            if (fHasAudioData)
+            {
+                WebMWriter::BlockData_Opus blockData = { pCtx->Audio.buf,  };
+                rc = pStream->pEBML->WriteBlock(pStream->uTrackAudio, &blockData, sizeof(blockData));
+            }
+#endif
+        } /* for */
+
+#ifdef VBOX_WITH_AUDIO_VIDEOREC
+        ASMAtomicWriteBool(&pCtx->fHasAudioData, false);
+#endif
     }
 
@@ -650 +676 @@
  * Retrieves a specific recording stream of a recording context.
  *
- * @returns Pointer to recording if found, or NULL if not found.
- * @param                       Recording context to look up stream for.
- * @param                       Screen number of recording stream to look up.
+ * @returns Pointer to recording stream if found, or NULL if not found.
+ * @param   pCtx                Recording context to look up stream for.
+ * @param   uScreen             Screen number of recording stream to look up.
  */
 DECLINLINE(PVIDEORECSTREAM) videoRecStreamGet(PVIDEORECCONTEXT pCtx, uint32_t uScreen)
@@ -801 +827 @@
     }
 
-    pStream->Video.uDelay = 1000 / uFPS;
+    pStream->Video.uDelayMs = 1000 / uFPS;
 
     if (fHasVideoTrack)
@@ -863 +889 @@
     pStream->fEnabled = true;
 
-
-
     return VINF_SUCCESS;
 }
@@ -889 +913 @@
  * @param   pCtx                Pointer to video recording context.
  * @param   uScreen             Screen ID.
- * @param   u64TimeStampMs      Current time stamp (in ms).
- */
-bool VideoRecIsReady(PVIDEORECCONTEXT pCtx, uint32_t uScreen, uint64_t u64TimeStampMs)
+ * @param   uTimeStampMs        Current time stamp (in ms).
+ */
+bool VideoRecIsReady(PVIDEORECCONTEXT pCtx, uint32_t uScreen, uint64_t uTimeStampMs)
 {
     uint32_t enmState = ASMAtomicReadU32(&g_enmState);
@@ -904 +928 @@
     }
 
-    if (u64TimeStampMs < pStream->uLastTimeStampMs + pStream->Video.uDelay)
+    if (uTimeStampMs < pStream->uLastTimeStampMs + pStream->Video.uDelayMs)
         return false;
 
-    if (ASMAtomicReadBool(&pStream->Video.fRgbFilled))
+    if (ASMAtomicReadBool(&pStream->fHasVideoData))
         return false;
 
@@ -971 +995 @@
                                            &pStream->Codec.VPX.RawImage,
                                            pts                           /* Time stamp */,
-                                           pStream->Video.uDelay               /* How long to show this frame */,
+                                           pStream->Video.uDelayMs               /* How long to show this frame */,
                                            0                             /* Flags */,
                                            pStream->Video.uEncoderDeadline     /* Quality setting */);
@@ -1003 +1027 @@
         }
     }
-
-    pStream->Video.cFrame++;
 #else
     RT_NOREF(pStream);
@@ -1016 +1038 @@
  *
  * @returns IPRT status code.
- * @param   pStrm      Strm.
+ * @param   pStream             Recording stream to convert RGB to YUV video frame buffer for.
  */
 static int videoRecRGBToYUV(PVIDEORECSTREAM pStream)
@@ -1055 +1077 @@
  * Sends an audio frame to the video encoding thread.
  *
+ * @thread  EMT
+ *
  * @returns IPRT status code.
  * @param   pCtx                Pointer to the video recording context.
@@ -1064 +1088 @@
 {
     RT_NOREF(pCtx, pvData, cbData, uTimestampMs);
+
+    /* To save time spent in EMT, do the required audio multiplexing in the encoding thread.
+     *
+     * The multiplexing is needed to supply all recorded (enabled) screens with the same
+     * audio data at the same given point in time.
+     */
+
+
     return VINF_SUCCESS;
 }
@@ -1084 +1116 @@
  * @param   uSrcHeight         Height of the video frame.
  * @param   puSrcData          Pointer to video frame data.
- * @param   u64TimeStampMs     Time stamp (in ms).
+ * @param   uTimeStampMs       Time stamp (in ms).
  */
 int VideoRecSendVideoFrame(PVIDEORECCONTEXT pCtx, uint32_t uScreen, uint32_t x, uint32_t y,
@@ -1112 +1144 @@
         if (!pStream->fEnabled)
         {
-            rc = VINF_TRY_AGAIN; /* not (yet) enabled */
-            break;
-        }
-        if (uTimeStampMs < pStream->uLastTimeStampMs + pStream->Video.uDelay)
-        {
-            rc = VINF_TRY_AGAIN; /* respect maximum frames per second */
-            break;
-        }
-        if (ASMAtomicReadBool(&pStream->Video.fRgbFilled))
-        {
-            rc = VERR_TRY_AGAIN; /* previous frame not yet encoded */
+            rc = VINF_TRY_AGAIN; /* Not (yet) enabled. */
+            break;
+        }
+
+        if (uTimeStampMs < pStream->uLastTimeStampMs + pStream->Video.uDelayMs)
+        {
+            rc = VINF_TRY_AGAIN; /* Respect maximum frames per second. */
+            break;
+        }
+
+        if (ASMAtomicReadBool(&pStream->fHasVideoData))
+        {
+            rc = VERR_TRY_AGAIN; /* Previous frame not yet encoded. */
             break;
         }
@@ -1130 +1164 @@
         int xDiff = ((int)pStream->Video.uDstWidth - (int)uSrcWidth) / 2;
         uint32_t w = uSrcWidth;
-        if ((int)w + xDiff + (int)x <= 0)  /* nothing visible */
+        if ((int)w + xDiff + (int)x <= 0)  /* Nothing visible. */
         {
             rc = VERR_INVALID_PARAMETER;
@@ -1148 +1182 @@
         uint32_t h = uSrcHeight;
         int yDiff = ((int)pStream->Video.uDstHeight - (int)uSrcHeight) / 2;
-        if ((int)h + yDiff + (int)y <= 0)  /* nothing visible */
+        if ((int)h + yDiff + (int)y <= 0)  /* Nothing visible. */
         {
             rc = VERR_INVALID_PARAMETER;
@@ -1167 +1201 @@
             || destY > pStream->Video.uDstHeight)
         {
-            rc = VERR_INVALID_PARAMETER;  /* nothing visible */
+            rc = VERR_INVALID_PARAMETER;  /* Nothing visible. */
             break;
         }
@@ -1219 +1253 @@
         for (unsigned int i = 0; i < h; i++)
         {
-            /* Overflow check */
+            /* Overflow check. */
             Assert(offSrc + w * bpp <= uSrcHeight * uBytesPerLine);
             Assert(offDst + w * bpp <= pStream->Video.uDstHeight * pStream->Video.uDstWidth * bpp);
+
             memcpy(pStream->Video.pu8RgbBuf + offDst, puSrcData + offSrc, w * bpp);
+
             offSrc += uBytesPerLine;
             offDst += pStream->Video.uDstWidth * bpp;
@@ -1229 +1265 @@
         pStream->uCurTimeStampMs = uTimeStampMs;
 
-        ASMAtomicWriteBool(&pStream->Video.fRgbFilled, true);
+        ASMAtomicWriteBool(&pStream->fHasVideoData, true);
         RTSemEventSignal(pCtx->WaitEvent);
 

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

@@ -29 +29 @@
 
 int  VideoRecStreamInit(PVIDEORECCONTEXT pCtx, uint32_t uScreen, const char *pszFile,
-                        uint32_t uWidth, uint32_t uHeight, uint32_t uRate, uint32_t uFps,
-                        uint32_t uMaxTime, uint32_t uMaxFileSize, const char *pszOptions);
+                        uint32_t uWidth, uint32_t uHeight, uint32_t uRate, uint32_t uFPS,
+                        uint32_t uMaxTimeS, uint32_t uMaxFileSizeMB, const char *pszOptions);
 
 bool VideoRecIsEnabled(PVIDEORECCONTEXT pCtx);
 int  VideoRecSendAudioFrame(PVIDEORECCONTEXT pCtx, const void *pvData, size_t cbData, uint64_t uTimestampMs);
 int  VideoRecSendVideoFrame(PVIDEORECCONTEXT pCtx, uint32_t uScreen,
-                            uint32_t x, uint32_t y, uint32_t uPixelFormat, uint32_t uBitsPerPixel,
-                            uint32_t uBytesPerLine, uint32_t uGuestWidth, uint32_t uGuestHeight,
-                            uint8_t *pu8BufferAddress, uint64_t u64TimeStampMs);
-bool VideoRecIsReady(PVIDEORECCONTEXT pCtx, uint32_t uScreen, uint64_t u64TimeStampMs);
-bool VideoRecIsLimitReached(PVIDEORECCONTEXT pCtx, uint32_t uScreen, uint64_t u64TimeStampMs);
+                            uint32_t x, uint32_t y, uint32_t uPixelFormat, uint32_t uBPP,
+                            uint32_t uBytesPerLine, uint32_t uSrcWidth, uint32_t uSrcHeight,
+                            uint8_t *puSrcData, uint64_t uTimeStampMs);
+bool VideoRecIsReady(PVIDEORECCONTEXT pCtx, uint32_t uScreen, uint64_t uTimeStampMs);
+bool VideoRecIsLimitReached(PVIDEORECCONTEXT pCtx, uint32_t uScreen, uint64_t tsNowMs);
 
 #endif /* !____H_VIDEOREC */