summaryrefslogtreecommitdiffstats
path: root/gst/qtdemux
diff options
context:
space:
mode:
authorWim Taymans <wim.taymans@collabora.co.uk>2009-06-07 20:49:50 +0200
committerWim Taymans <wim@metal.(none)>2009-06-07 20:49:50 +0200
commit9f022c8a8503c2ce0fa617fdb50e41706dd412f5 (patch)
treef4c0200a9c5d9a96c547c95282b2648b556ac661 /gst/qtdemux
parent790b050fc5302cae89cddcd23b258093967d05a9 (diff)
Revert "qtdemux: fill timestamp table completely"
This reverts commit 790b050fc5302cae89cddcd23b258093967d05a9. I forgot we were frozen.
Diffstat (limited to 'gst/qtdemux')
-rw-r--r--gst/qtdemux/qtdemux.c21
1 files changed, 3 insertions, 18 deletions
diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c
index 4841222e..8f800697 100644
--- a/gst/qtdemux/qtdemux.c
+++ b/gst/qtdemux/qtdemux.c
@@ -3464,7 +3464,6 @@ qtdemux_parse_samples (GstQTDemux * qtdemux, QtDemuxStream * stream,
done2:
n_sample_times = QT_UINT32 (stts_data + 12);
- GST_LOG_OBJECT (qtdemux, "%u timestamp blocks", n_sample_times);
timestamp = 0;
stream->min_duration = 0;
time = 0;
@@ -3478,17 +3477,14 @@ qtdemux_parse_samples (GstQTDemux * qtdemux, QtDemuxStream * stream,
stts_data += 4;
duration = QT_UINT32 (stts_data);
stts_data += 4;
- GST_LOG_OBJECT (qtdemux, "block %d, %u timestamps, duration %u ", i, n,
- duration);
/* take first duration for fps */
if (G_UNLIKELY (stream->min_duration == 0))
stream->min_duration = duration;
for (j = 0; j < n; j++) {
- GST_DEBUG_OBJECT (qtdemux,
- "sample %d: index %d, timestamp %" GST_TIME_FORMAT, index, j,
- GST_TIME_ARGS (timestamp));
+ GST_DEBUG_OBJECT (qtdemux, "sample %d: timestamp %" GST_TIME_FORMAT,
+ index, GST_TIME_ARGS (timestamp));
samples[index].timestamp = timestamp;
/* add non-scaled values to avoid rounding errors */
@@ -3501,16 +3497,6 @@ qtdemux_parse_samples (GstQTDemux * qtdemux, QtDemuxStream * stream,
goto done3;
}
}
- /* fill up empty timestamps with the last timestamp, this can happen when
- * the last samples do not decoder and so we don't have timestamps for them.
- * We however look at the last timestamp to estimate the track length so we
- * need something in here. */
- for (; index < n_samples; index++) {
- GST_DEBUG_OBJECT (qtdemux, "fill sample %d: timestamp %" GST_TIME_FORMAT,
- index, GST_TIME_ARGS (timestamp));
- samples[index].timestamp = timestamp;
- samples[index].duration = -1;
- }
done3:
/* sample sync, can be NULL */
@@ -3797,8 +3783,7 @@ done:
stream->segments[0].media_stop = stream_duration;
stream->segments[0].rate = 1.0;
- GST_DEBUG_OBJECT (qtdemux, "created dummy segment %" GST_TIME_FORMAT,
- GST_TIME_ARGS (stream_duration));
+ GST_DEBUG_OBJECT (qtdemux, "created dummy segment");
stream->n_segments = 1;
}
GST_DEBUG_OBJECT (qtdemux, "using %d segments", stream->n_segments);