mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 07:58:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

adaptivedemux: Handle stop_type:SET, stop:NONE

Browse source 
Seek values of type GST_SEEK_TYPE_SET with values of GST_CLOCK_TIME_NONE
are perfectly valid (we essentially don't modify the existing position)
This commit is contained in:
Edward Hervey 2017-05-15 18:10:11 +02:00 committed by Edward Hervey
parent 7d64bb7513
commit 6a6ddb26b4
1 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
gst-libs/gst/adaptivedemux/gstadaptivedemux.c
View file

@ -1507,6 +1507,7 @@ gst_adaptive_demux_handle_seek_event (GstAdaptiveDemux * demux, GstPad * pad,
if (gst_adaptive_demux_is_live (demux)) { if (gst_adaptive_demux_is_live (demux)) {
gint64 range_start, range_stop; gint64 range_start, range_stop;
gboolean changed = FALSE; gboolean changed = FALSE;
gboolean start_valid = TRUE, stop_valid = TRUE;
if (!gst_adaptive_demux_get_live_seek_range (demux, &range_start, if (!gst_adaptive_demux_get_live_seek_range (demux, &range_start,
&range_stop)) { &range_stop)) {
@ -1555,13 +1556,29 @@ gst_adaptive_demux_handle_seek_event (GstAdaptiveDemux * demux, GstPad * pad,
} }
} }
if (start_type == GST_SEEK_TYPE_SET && GST_CLOCK_TIME_IS_VALID (start) &&
(start < range_start || start > range_stop)) {
GST_WARNING_OBJECT (demux,
"Seek to invalid position start:%" GST_STIME_FORMAT
" out of seekable range (%" GST_STIME_FORMAT " - %" GST_STIME_FORMAT
")", GST_STIME_ARGS (start), GST_STIME_ARGS (range_start),
GST_STIME_ARGS (range_stop));
start_valid = FALSE;
}
if (stop_type == GST_SEEK_TYPE_SET && GST_CLOCK_TIME_IS_VALID (stop) &&
(stop < range_start || stop > range_stop)) {
GST_WARNING_OBJECT (demux,
"Seek to invalid position stop:%" GST_STIME_FORMAT
" out of seekable range (%" GST_STIME_FORMAT " - %" GST_STIME_FORMAT
")", GST_STIME_ARGS (stop), GST_STIME_ARGS (range_start),
GST_STIME_ARGS (range_stop));
stop_valid = FALSE;
}
/* If the seek position is still outside of the seekable range, refuse the seek */ /* If the seek position is still outside of the seekable range, refuse the seek */
if (((start_type == GST_SEEK_TYPE_SET) && (start < range_start if (!start_valid || !stop_valid) {
|| start > range_stop)) || ((stop_type == GST_SEEK_TYPE_SET)
&& (stop < range_start || stop > range_stop))) {
GST_MANIFEST_UNLOCK (demux); GST_MANIFEST_UNLOCK (demux);
GST_API_UNLOCK (demux); GST_API_UNLOCK (demux);
GST_WARNING_OBJECT (demux, "Seek to invalid position");
gst_event_unref (event); gst_event_unref (event);
return FALSE; return FALSE;
} }