mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-05 15:08:53 +00:00
Code Issues 1 Projects Releases Wiki Activity

adaptivedemux: only update stream position if query success

Browse source 
We don't need to check about the query fail case.
because it is update to segment position even though query fail.

https://bugzilla.gnome.org/show_bug.cgi?id=748529
This commit is contained in:
Jimmy Ohn 2015-04-29 18:23:31 +09:00 committed by Thiago Santos
parent c32354e70e
commit 868472affb
1 changed files with 3 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1974,38 +1974,27 @@ gst_adaptive_demux_stream_download_loop (GstAdaptiveDemuxStream * stream)
GST_DEBUG_OBJECT (stream->pad, GST_DEBUG_OBJECT (stream->pad,
"Activating stream due to reconfigure event"); "Activating stream due to reconfigure event");
cur = stream->segment.position; cur = ts = stream->segment.position;
if (gst_pad_peer_query_position (stream->pad, GST_FORMAT_TIME, &pos)) { if (gst_pad_peer_query_position (stream->pad, GST_FORMAT_TIME, &pos)) {
ts = (GstClockTime) pos; ts = (GstClockTime) pos;
GST_DEBUG_OBJECT (demux, "Downstream position: %" GST_DEBUG_OBJECT (demux, "Downstream position: %"
GST_TIME_FORMAT, GST_TIME_ARGS (ts)); GST_TIME_FORMAT, GST_TIME_ARGS (ts));
} else { } else {
gboolean have_pos = FALSE;
/* query other pads as some faulty element in the pad's branch might /* query other pads as some faulty element in the pad's branch might
* reject position queries. This should be better than using the * reject position queries. This should be better than using the
* demux segment position that can be much ahead */ * demux segment position that can be much ahead */
for (GList * iter = demux->streams; iter != NULL; for (GList * iter = demux->streams; iter != NULL;
iter = g_list_next (iter)) { iter = g_list_next (iter)) {
GstAdaptiveDemuxStream *cur_stream = iter->data; GstAdaptiveDemuxStream *cur_stream = (GstAdaptiveDemuxStream *)iter->data;
have_pos = if (gst_pad_peer_query_position (cur_stream->pad, GST_FORMAT_TIME, &pos)) {
gst_pad_peer_query_position (cur_stream->pad, GST_FORMAT_TIME,
&pos);
if (have_pos) {
ts = (GstClockTime) pos; ts = (GstClockTime) pos;
GST_DEBUG_OBJECT (stream->pad, "Downstream position: %" GST_DEBUG_OBJECT (stream->pad, "Downstream position: %"
GST_TIME_FORMAT, GST_TIME_ARGS (ts)); GST_TIME_FORMAT, GST_TIME_ARGS (ts));
break; break;
} }
} }
if (!have_pos) {
ts = stream->segment.position;
GST_DEBUG_OBJECT (stream->pad, "Downstream position query failed, "
"failling back to looking at other pads");
}
} }
/* we might have already pushed this data */ /* we might have already pushed this data */