Changeset 1181

Timestamp:

10/24/09 01:59:31 (10 months ago)

Author:

astrange

Message:

Support tracks with start time delays. Fixes #424.

Location:

trunk

Files:

• MatroskaImport.h (modified) (1 diff)
• MatroskaImportPrivate.cpp (modified) (2 diffs)
• ff_private.c (modified) (6 diffs)

trunk/MatroskaImport.h

@@ -161 +161 @@
         int                                             displayOffsetSum;
         SInt64                                  durationSinceZeroSum;
+        
+        // the timestamp of the first block, used to set delay for the track
+        TimeValue64                             lowestPTS;
 };
 

trunk/MatroskaImportPrivate.cpp

@@ -1027 +1027 @@
         bool replaceSoundDesc = false;
         
+        lowestPTS = block.GlobalTimecode();
+        
         if (desc) {
                 switch ((*desc)->dataFormat) {
@@ -1233 +1235 @@
         if (err)
                 Codecprintf(NULL, "MKV: error inserting media into track %d\n", err);
-        else
+        
+        if (!err) {
+                if (!maxLoadedTime && lowestPTS)
+                        SetTrackOffset(theTrack, lowestPTS / timecodeScale);
+                
                 maxLoadedTime += durationToAdd;
+        }
         
         durationToAdd = 0;

trunk/ff_private.c

@@ -910 +910 @@
                         TimeScale mediaTimeScale;
                         TimeScale movieTimeScale;
+                        int startTime = map[j].str->index_entries[0].timestamp;
 
                         mediaDuration = GetMediaDuration(media);
@@ -927 +928 @@
                         result = InsertMediaIntoTrack(track, time.value.lo, 0, mediaDuration, fixed1);
 
+                        // set audio/video start delay
+                        // note str.start_time exists but is always 0 for AVI
+                        if (startTime) {
+                                TimeRecord startTimeRec;
+                                startTimeRec.value.hi = 0;
+                                startTimeRec.value.lo = startTime * map[j].str->time_base.num;
+                                startTimeRec.scale = map[j].str->time_base.den;
+                                startTimeRec.base = NULL;
+                                ConvertTimeScale(&startTimeRec, movieTimeScale);
+                                SetTrackOffset(track, startTimeRec.value.lo);
+                        }
+                        
                         if(result != noErr)
                                 goto bail;
@@ -961 +974 @@
         ComponentResult result;
         TimeValue minLoadedTime;
+        TimeValue movieTimeScale = GetMovieTimeScale(storage->movie);
         int64_t availableSize, margin;
         long idling;
         int readResult, framesProcessed, i;
+        int firstPts[storage->map_count];
         short flags;
         
@@ -991 +1006 @@
         }
         
+        for(i = 0; i < storage->map_count; i++)
+                firstPts[i] = -1;
+        
         // record stream durations before we add any samples so that we know what to tell InsertMediaIntoTrack later
         for(i = 0; i < storage->map_count; i++) {
@@ -1018 +1036 @@
                 sampleRec.dataSize = packet.size;
                 sampleRec.sampleFlags = flags;
+                                
+                if(firstPts[packet.stream_index] < 0)
+                        firstPts[packet.stream_index] = packet.pts;
                 
                 if(packet.size > storage->largestPacketSize)
@@ -1107 +1128 @@
                                 result = InsertMediaIntoTrack(track, -1, prevDuration, addedDuration, fixed1);
                         }
+                        
+                        if (!prevDuration && firstPts[i] > 0) {
+                                TimeRecord startTimeRec;
+                                startTimeRec.value.hi = 0;
+                                startTimeRec.value.lo = firstPts[i] * formatContext->streams[i]->time_base.num;
+                                startTimeRec.scale = formatContext->streams[i]->time_base.den;
+                                startTimeRec.base = NULL;
+                                ConvertTimeScale(&startTimeRec, movieTimeScale);
+                                SetTrackOffset(track, startTimeRec.value.lo);
+                        }
                         ncstream->duration = -1;
                 }