mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-20 15:27:07 +00:00
Code Issues 1 Projects Releases Wiki Activity

qtdemux: always keep media segments within total duration

Browse source 
... as opposed to only doing so following a seek.
This commit is contained in:
Mark Nauwelaerts 2010-01-20 15:18:47 +01:00
parent 95333115cd
commit 8ca984d5e8
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
gst/qtdemux/qtdemux.c
View file

@ -2054,6 +2054,14 @@ gst_qtdemux_activate_segment (GstQTDemux * qtdemux, QtDemuxStream * stream,
return FALSE; return FALSE;
} }
/* segment lies beyond total indicated duration */
if (G_UNLIKELY (segment->duration != -1 && segment->time > segment->duration)) {
GST_WARNING_OBJECT (qtdemux, "segment->duration %" G_GUINT64_FORMAT
" < segment->time %" G_GUINT64_FORMAT, segment->duration,
segment->time);
return FALSE;
}
/* get time in this segment */ /* get time in this segment */
seg_time = offset - segment->time; seg_time = offset - segment->time;
@ -2072,12 +2080,14 @@ gst_qtdemux_activate_segment (GstQTDemux * qtdemux, QtDemuxStream * stream,
* In order to compare the two, we need to bring segment.stop * In order to compare the two, we need to bring segment.stop
* into the track-time-realm */ * into the track-time-realm */
if (qtdemux->segment.stop == -1) stop = qtdemux->segment.stop;
if (stop == -1)
stop = qtdemux->segment.duration;
if (stop == -1)
stop = segment->media_stop; stop = segment->media_stop;
else else
stop = stop =
MIN (segment->media_stop, MIN (segment->media_stop, stop - segment->time + segment->media_start);
qtdemux->segment.stop - segment->time + segment->media_start);
if (qtdemux->segment.rate >= 0) { if (qtdemux->segment.rate >= 0) {
start = MIN (segment->media_start + seg_time, stop); start = MIN (segment->media_start + seg_time, stop);