mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-24 09:10:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

qtdemux: elst should offset samples instead of buffers

Browse source 
The current approach where buffers are offset is not ideal, as during seek
and loop current time is compared to sample times.

https://bugzilla.gnome.org/show_bug.cgi?id=700264
This commit is contained in:
Matej Knopp 2013-07-31 10:42:07 +02:00 committed by Sebastian Dröge
parent 6c349d6ec3
commit 2269ac8f28
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
gst/isomp4/qtdemux.c
View file

@ -2559,7 +2559,9 @@ qtdemux_parse_trun (GstQTDemux * qtdemux, GstByteReader * trun,
sample->offset = *running_offset; sample->offset = *running_offset;
sample->pts_offset = ct; sample->pts_offset = ct;
sample->size = size; sample->size = size;
sample->timestamp = timestamp; sample->timestamp =
timestamp + gst_util_uint64_scale (stream->elst_offset,
stream->timescale, GST_SECOND);
sample->duration = dur; sample->duration = dur;
/* sample-is-difference-sample */ /* sample-is-difference-sample */
/* ismv seems to use 0x40 for keyframe, 0xc0 for non-keyframe, /* ismv seems to use 0x40 for keyframe, 0xc0 for non-keyframe,
@ -3958,11 +3960,6 @@ gst_qtdemux_decorate_and_push_buffer (GstQTDemux * qtdemux,
GstFlowReturn ret = GST_FLOW_OK; GstFlowReturn ret = GST_FLOW_OK;
/* offset the timestamps according to the edit list */ /* offset the timestamps according to the edit list */
if (GST_CLOCK_TIME_IS_VALID (pts))
pts += stream->elst_offset;
if (GST_CLOCK_TIME_IS_VALID (dts))
dts += stream->elst_offset;
position += stream->elst_offset;
if (G_UNLIKELY (stream->fourcc == FOURCC_rtsp)) { if (G_UNLIKELY (stream->fourcc == FOURCC_rtsp)) {
gchar *url; gchar *url;
@ -6301,7 +6298,10 @@ qtdemux_parse_samples (GstQTDemux * qtdemux, QtDemuxStream * stream, guint32 n)
j, GST_TIME_ARGS (gst_util_uint64_scale (stream->stco_sample_index, j, GST_TIME_ARGS (gst_util_uint64_scale (stream->stco_sample_index,
GST_SECOND, stream->timescale)), cur->size); GST_SECOND, stream->timescale)), cur->size);
cur->timestamp = stream->stco_sample_index; cur->timestamp =
stream->stco_sample_index +
gst_util_uint64_scale (stream->elst_offset, stream->timescale,
GST_SECOND);
cur->duration = stream->samples_per_chunk; cur->duration = stream->samples_per_chunk;
cur->keyframe = TRUE; cur->keyframe = TRUE;
cur++; cur++;
@ -6318,9 +6318,13 @@ qtdemux_parse_samples (GstQTDemux * qtdemux, QtDemuxStream * stream, guint32 n)
done2: done2:
{ {
guint32 n_sample_times; guint32 n_sample_times;
gint64 elst_offset;
n_sample_times = stream->n_sample_times; n_sample_times = stream->n_sample_times;
cur = first; cur = first;
elst_offset =
gst_util_uint64_scale (stream->elst_offset, stream->timescale,
GST_SECOND);
for (i = stream->stts_index; i < n_sample_times; i++) { for (i = stream->stts_index; i < n_sample_times; i++) {
guint32 stts_samples; guint32 stts_samples;
@ -6352,7 +6356,7 @@ done2:
GST_TIME_ARGS (gst_util_uint64_scale (stts_time, GST_SECOND, GST_TIME_ARGS (gst_util_uint64_scale (stts_time, GST_SECOND,
stream->timescale))); stream->timescale)));
cur->timestamp = stts_time; cur->timestamp = stts_time + elst_offset;
cur->duration = stts_duration; cur->duration = stts_duration;
/* avoid 32-bit wrap-around, /* avoid 32-bit wrap-around,
@ -6381,7 +6385,7 @@ done2:
(guint) (cur - samples), (guint) (cur - samples),
GST_TIME_ARGS (gst_util_uint64_scale (stream->stts_time, GST_SECOND, GST_TIME_ARGS (gst_util_uint64_scale (stream->stts_time, GST_SECOND,
stream->timescale))); stream->timescale)));
cur->timestamp = stream->stts_time; cur->timestamp = stream->stts_time + elst_offset;
cur->duration = -1; cur->duration = -1;
} }
} }