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

Timestamp:

Sep 21, 2017 2:00:57 PM (7 years ago)

Author:

vboxsync

Message:

VideoRec: Fixed seeking in recorded files.

File:

• trunk/src/VBox/Main/src-client/EbmlWriter.cpp (modified) (4 diffs)

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

@@ -499 +499 @@
     {
         WebMSegment(void)
-            : tcStart(UINT64_MAX)
-            , tcEnd(UINT64_MAX)
+            : tcStart(0)
+            , tcEnd(0)
             , offStart(0)
             , offInfo(0)
@@ -829 +829 @@
         Cluster.cBlocks++;
 
+        if (CurSeg.tcEnd < Cluster.tcEndMs)
+            CurSeg.tcEnd = Cluster.tcEndMs;
+
         /* Calculate the block's timecode, which is relative to the cluster's starting timecode. */
         uint16_t tcBlockMs = static_cast<uint16_t>(tcPTSMs - Cluster.tcStartMs);
@@ -905 +908 @@
         Cluster.tcEndMs = tcPTSMs;
         Cluster.cBlocks++;
+
+        if (CurSeg.tcEnd < Cluster.tcEndMs)
+            CurSeg.tcEnd = Cluster.tcEndMs;
 
         /* Calculate the block's timecode, which is relative to the cluster's starting timecode. */
@@ -1107 +1113 @@
         RTStrPrintf(szApp, sizeof(szApp), VBOX_PRODUCT " %sr%u", VBOX_VERSION_STRING, RTBldCfgRevision());
 
-        LogFunc(("Duration=%RU64\n", CurSeg.tcEnd - CurSeg.tcStart));
+        const uint64_t tcDuration = CurSeg.tcEnd - CurSeg.tcStart;
+
+        if (!CurSeg.lstCues.empty())
+        {
+            LogFunc(("tcDuration=%RU64\n", tcDuration));
+            AssertMsg(tcDuration, ("Segment seems to be empty\n"));
+        }
 
         m_Ebml.subStart(MkvElem_Info)
               .serializeUnsignedInteger(MkvElem_TimecodeScale, CurSeg.uTimecodeScaleFactor)
-              .serializeFloat(MkvElem_Segment_Duration, CurSeg.tcEnd - CurSeg.tcStart)
+              .serializeFloat(MkvElem_Segment_Duration, tcDuration)
               .serializeString(MkvElem_MuxingApp, szMux)
               .serializeString(MkvElem_WritingApp, szApp)