Changeset 52427 in vbox

Timestamp:

Aug 20, 2014 8:59:33 AM (11 years ago)

Author:

vboxsync

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

95608

Message:

#6219: Segment duration calculation fixes. Coding style fixes.

Location:

trunk/src/VBox/Main/src-client

Files:

• DisplayImpl.cpp (modified) (1 diff)
• EbmlWriter.cpp (modified) (3 diffs)
• EbmlWriter.h (modified) (1 diff)

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

@@ -3778 +3778 @@
                     continue;
 
-                if(VideoRecIsFull(pDisplay->mpVideoRecCtx, uScreenId, u64Now))
+                if (VideoRecIsFull(pDisplay->mpVideoRecCtx, uScreenId, u64Now))
                 {
                     pDisplay->i_VideoCaptureStop();

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

@@ -45 +45 @@
     m_bDebug(false),
     m_iLastPtsMs(-1),
+    m_iInitialPtsMs(-1),
     m_Framerate(),
     m_uPositionReference(0),
@@ -108 +109 @@
     m_Ebml.subStart(Info)
           .serializeUnsignedInteger(TimecodeScale, 1000000)
-          .serializeFloat(Segment_Duration, m_iLastPtsMs + iFrameTime)
+          .serializeFloat(Segment_Duration, m_iLastPtsMs + iFrameTime - m_iInitialPtsMs)
           .serializeString(MuxingApp, szVersion)
           .serializeString(WritingApp, szVersion)
@@ -179 +180 @@
             iPtsMs = m_iLastPtsMs + 1;
         m_iLastPtsMs = iPtsMs;
+
+        if (m_iInitialPtsMs < 0)
+          m_iInitialPtsMs = m_iLastPtsMs;
 
         /* Calculate the relative time of this block */

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

@@ -425 +425 @@
     bool            m_bDebug;
     int64_t         m_iLastPtsMs;
+    int64_t         m_iInitialPtsMs;
     vpx_rational_t  m_Framerate;