Changeset 65541 in vbox for trunk

Timestamp:

Jan 31, 2017 1:44:29 PM (8 years ago)

Author:

vboxsync

Message:

Main/EbmlWriter.cpp: Pass the time stamp for writeBlockOpus(). Not used yet.

File:

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

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

@@ -770 +770 @@
 #ifdef VBOX_WITH_LIBOPUS
     /* Audio blocks that have same absolute timecode as video blocks SHOULD be written before the video blocks. */
-    int writeBlockOpus(WebMTrack *a_pTrack, const void *pvData, size_t cbData)
+    int writeBlockOpus(WebMTrack *a_pTrack, const void *pvData, size_t cbData, uint64_t uTimeStampMs)
     {
         AssertPtrReturn(a_pTrack, VERR_INVALID_POINTER);
@@ -776 +776 @@
         AssertReturn(cbData, VERR_INVALID_PARAMETER);
 
+        RT_NOREF(uTimeStampMs);
+
         WebMCluster &Cluster = CurSeg.CurCluster;
 
@@ -788 +790 @@
             Cluster.tcStart = tcPTS;
 
-        LogFunc(("tcPTSRaw=%RU64, tcPTS=%RU64, cbData=%RU64\n", tcPTSRaw, tcPTS, Cluster.cbData));
+        LogFunc(("tcPTSRaw=%RU64, tcPTS=%RU64, cbData=%RU64, uTimeStampMs=%RU64\n",
+                 tcPTSRaw, tcPTS, Cluster.cbData, uTimeStampMs));
 
         Cluster.tcLast = tcPTS;
@@ -873 +876 @@
                     Assert(cbData == sizeof(WebMWriter::BlockData_Opus));
                     WebMWriter::BlockData_Opus *pData = (WebMWriter::BlockData_Opus *)pvData;
-                    rc = writeBlockOpus(pTrack, pData->pvData, pData->cbData);
+                    rc = writeBlockOpus(pTrack, pData->pvData, pData->cbData, pData->uTimestampMs);
                 }
                 else