Changeset 75041 in vbox

Timestamp:

Oct 24, 2018 1:57:34 PM (7 years ago)

Author:

vboxsync

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

126084

Message:

VideoRec/WebMWriter: Fixed the relative timecode handling when starting recording a VM which already is running.

Location:

trunk/src/VBox/Main

Files:

• include/WebMWriter.h (modified) (1 diff)
• src-client/WebMWriter.cpp (modified) (10 diffs)

trunk/src/VBox/Main/include/WebMWriter.h

@@ -363 +363 @@
         /** Absolute timecode (in ms) when this cluster starts. */
         WebMTimecodeAbs tcAbsStartMs;
+        /** Absolute timecode (in ms) of when last written to this cluster. */
+        WebMTimecodeAbs tcAbsLastWrittenMs;
         /** Number of (simple) blocks in this cluster. */
         uint64_t        cBlocks;

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

@@ -441 +441 @@
         const WebMTimecodeAbs tcAbsPTS = a_pBlock->Data.tcAbsPTSMs;
 
-        /* Check if the current segment already has been started.
-         * If not, use the current (absolute) time stamp for it. */
-        if (CurSeg.tcAbsStartMs == 0)
-        {
-            CurSeg.tcAbsStartMs = tcAbsPTS;
-            LogFunc(("Segment started @ %RU64ms\n", CurSeg.tcAbsStartMs));
-        }
-
         /* See if we already have an entry for the specified timecode in our queue. */
         WebMBlockMap::iterator itQueue = CurSeg.queueBlocks.Map.find(tcAbsPTS);
@@ -464 +456 @@
         }
 
-        processQueue(&CurSeg.queueBlocks, false /* fForce */);
+        rc = processQueue(&CurSeg.queueBlocks, false /* fForce */);
     }
     catch(...)
@@ -496 +488 @@
         && tcAbsPTSMs <= a_pTrack->tcAbsLastWrittenMs)
     {
+        AssertFailed(); /* Should never happen. */
         tcAbsPTSMs = a_pTrack->tcAbsLastWrittenMs + 1;
     }
@@ -646 +639 @@
         bool fClusterStart = false;
 
+        /* If the current segment does not have any clusters (yet),
+         * take the first absolute PTS as the starting point for that segment. */
+        if (CurSeg.cClusters == 0)
+        {
+            CurSeg.tcAbsStartMs = mapAbsPTSMs;
+            fClusterStart = true;
+        }
+
         /* No blocks written yet? Start a new cluster. */
         if (Cluster.cBlocks == 0)
@@ -661 +662 @@
             && !mapBlocks.fClusterStarted)
         {
+            /* Last written timecode of the current cluster. */
+            uint64_t tcAbsClusterLastWrittenMs;
+
             if (Cluster.fOpen) /* Close current cluster first. */
             {
-                /* Make sure that the current cluster contained some data.  */
+                Log2Func(("[C%RU64] End @ %RU64ms (duration = %RU64ms)\n",
+                          Cluster.uID, Cluster.tcAbsLastWrittenMs, Cluster.tcAbsLastWrittenMs - Cluster.tcAbsStartMs));
+
+                /* Make sure that the current cluster contained some data. */
                 Assert(Cluster.offStart);
                 Assert(Cluster.cBlocks);
+
+                /* Save the last written timecode of the current cluster before closing it. */
+                tcAbsClusterLastWrittenMs = Cluster.tcAbsLastWrittenMs;
 
                 subEnd(MkvElem_Cluster);
                 Cluster.fOpen = false;
             }
-
-            Cluster.fOpen        = true;
-            Cluster.uID          = CurSeg.cClusters;
-            Cluster.tcAbsStartMs = mapAbsPTSMs;
-            Cluster.offStart     = RTFileTell(getFile());
-            Cluster.cBlocks      = 0;
+            else /* First cluster ever? Use the segment's starting timecode. */
+                tcAbsClusterLastWrittenMs = CurSeg.tcAbsStartMs;
+
+            Assert(tcAbsClusterLastWrittenMs >= CurSeg.tcAbsStartMs);
+
+            Cluster.fOpen              = true;
+            Cluster.uID                = CurSeg.cClusters;
+            /* Use the last written timecode of the former cluster as starting point. */
+            Cluster.tcAbsStartMs       = tcAbsClusterLastWrittenMs;
+            Cluster.tcAbsLastWrittenMs = Cluster.tcAbsStartMs;
+            Cluster.offStart           = RTFileTell(getFile());
+            Cluster.cBlocks            = 0;
 
             Log2Func(("[C%RU64] Start @ %RU64ms (map TC is %RU64) / %RU64 bytes\n",
@@ -693 +709 @@
 
             subStart(MkvElem_Cluster)
-                .serializeUnsignedInteger(MkvElem_Timecode, Cluster.tcAbsStartMs);
+                .serializeUnsignedInteger(MkvElem_Timecode, Cluster.tcAbsStartMs - CurSeg.tcAbsStartMs);
 
             CurSeg.cClusters++;
@@ -699 +715 @@
             mapBlocks.fClusterStarted = true;
         }
+
+        Log2Func(("[C%RU64] SegTcAbsStartMs=%RU64, ClusterTcAbsStartMs=%RU64, ClusterTcAbsLastWrittenMs=%RU64, mapAbsPTSMs=%RU64\n",
+                   Cluster.uID, CurSeg.tcAbsStartMs, Cluster.tcAbsStartMs, Cluster.tcAbsLastWrittenMs, mapAbsPTSMs));
 
         /* Iterate through all blocks related to the current timecode. */
@@ -717 +736 @@
 
             Cluster.cBlocks++;
+            Cluster.tcAbsLastWrittenMs = pBlock->Data.tcAbsPTSMs;
 
             pTrack->cTotalBlocks++;
-            pTrack->tcAbsLastWrittenMs = pBlock->Data.tcAbsPTSMs;
+            pTrack->tcAbsLastWrittenMs = Cluster.tcAbsLastWrittenMs;
 
             if (CurSeg.tcAbsLastWrittenMs < pTrack->tcAbsLastWrittenMs)
@@ -730 +750 @@
             {
                 /* Insert cue points for all tracks if a new cluster has been started. */
-                WebMCuePoint *pCuePoint = new WebMCuePoint(CurSeg.tcAbsLastWrittenMs);
+                WebMCuePoint *pCuePoint = new WebMCuePoint(Cluster.tcAbsLastWrittenMs);
 
                 WebMTracks::iterator itTrack = CurSeg.mapTracks.begin();
@@ -847 +867 @@
         CurSeg.offSeekInfo = RTFileTell(getFile());
 
-    LogFunc(("Seek Headeder @ %RU64\n", CurSeg.offSeekInfo));
+    LogFunc(("Seek Header @ %RU64\n", CurSeg.offSeekInfo));
 
     subStart(MkvElem_SeekHead);