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

Timestamp:

Jan 24, 2017 5:45:20 PM (8 years ago)

Author:

vboxsync

Message:

VideoRec: Update.

Location:

trunk/src/VBox/Main/src-client

Files:

• DrvAudioVideoRec.cpp (modified) (1 diff)
• VideoRec.cpp (modified) (4 diffs)

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

@@ -698 +698 @@
                 case AVRECCONTAINERTYPE_WEBM:
                 {
-                    WebMWriter::BlockData_Opus blockData = { abDst, cbDst };
+                    WebMWriter::BlockData_Opus blockData = { abDst, cbDst, RTTimeMilliTS() };
                     rc = pSink->Con.WebM.pWebM->WriteBlock(pSink->Con.WebM.uTrack, &blockData, sizeof(blockData));
                     AssertRC(rc);

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

@@ -518 +518 @@
 
 #ifdef VBOX_WITH_AUDIO_VIDEOREC
-        ASMAtomicWriteBool(&pCtx->fHasAudioData, false);
+        if (fHasAudioData)
+            ASMAtomicWriteBool(&pCtx->fHasAudioData, false);
 #endif
     }
@@ -907 +908 @@
 bool VideoRecIsEnabled(PVIDEORECCONTEXT pCtx)
 {
-    RT_NOREF(pCtx);
+    if (!pCtx)
+        return false;
+
     uint32_t enmState = ASMAtomicReadU32(&pCtx->enmState);
+
     return (   enmState == VIDEORECSTS_IDLE
             || enmState == VIDEORECSTS_BUSY);
@@ -924 +928 @@
 bool VideoRecIsReady(PVIDEORECCONTEXT pCtx, uint32_t uScreen, uint64_t uTimeStampMs)
 {
+    AssertPtrReturn(pCtx, false);
+
     uint32_t enmState = ASMAtomicReadU32(&pCtx->enmState);
     if (enmState != VIDEORECSTS_IDLE)
@@ -1118 +1124 @@
 
     memcpy(pCtx->Audio.abBuf, pvData, RT_MIN(_64K, cbData));
+
+    pCtx->Audio.cbBuf        = cbData;
     pCtx->Audio.uTimeStampMs = uTimeStampMs;