Changeset 69188 in vbox for trunk/src

Timestamp:

Oct 24, 2017 8:59:02 AM (7 years ago)

Author:

vboxsync

Message:

VideoRec/DrvAudioVideoRec: Use a PTS for encoding.

File:

• trunk/src/VBox/Main/src-client/DrvAudioVideoRec.cpp (modified) (7 diffs)

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

@@ -232 +232 @@
     /** Codec data this sink uses for encoding. */
     AVRECCODEC           Codec;
+    /** Timestamp (in ms) of when the sink was created. */
+    uint64_t             tsStartMs;
 } AVRECSINK, *PAVRECSINK;
 
@@ -245 +247 @@
     /** Pointer to sink to use for writing. */
     PAVRECSINK           pSink;
+    /** Last encoded PTS (in ms). */
+    uint64_t             uLastPTSMs;
 } AVRECSTREAM, *PAVRECSTREAM;
 
@@ -410 +414 @@
         pSink->Codec.STAM.msEncTotal = 0;
 #endif
+
+        pSink->tsStartMs             = RTTimeMilliTS();
     }
     else
@@ -509 +515 @@
     if (RT_SUCCESS(rc))
     {
-        pStreamAV->pSink = pSink; /* Assign sink to stream. */
+        pStreamAV->pSink      = pSink; /* Assign sink to stream. */
+        pStreamAV->uLastPTSMs = 0;
 
         if (pCfgAcq)
@@ -760 +767 @@
             Assert(cEncFrames == 1); /* At the moment we encode exactly *one* frame per frame. */
 
+            if (pStreamAV->uLastPTSMs == 0)
+                pStreamAV->uLastPTSMs = RTTimeMilliTS() - pSink->tsStartMs;
+
             const uint64_t uDurationMs = pSink->Codec.Opus.msFrame * cEncFrames;
+            const uint64_t uPTSMs      = pStreamAV->uLastPTSMs + uDurationMs;
+
+            pStreamAV->uLastPTSMs += uDurationMs;
 
             switch (pSink->Con.Parms.enmType)
@@ -766 +779 @@
                 case AVRECCONTAINERTYPE_MAIN_CONSOLE:
                 {
-                    HRESULT hr = pSink->Con.Main.pConsole->i_audioVideoRecSendAudio(abDst, cbDst, uDurationMs);
+                    HRESULT hr = pSink->Con.Main.pConsole->i_audioVideoRecSendAudio(abDst, cbDst, uPTSMs);
                     Assert(hr == S_OK);
                     RT_NOREF(hr);
@@ -775 +788 @@
                 case AVRECCONTAINERTYPE_WEBM:
                 {
-                    WebMWriter::BlockData_Opus blockData = { abDst, cbDst, uDurationMs };
+                    WebMWriter::BlockData_Opus blockData = { abDst, cbDst, uPTSMs };
                     rc = pSink->Con.WebM.pWebM->WriteBlock(pSink->Con.WebM.uTrack, &blockData, sizeof(blockData));
                     AssertRC(rc);