diff options
| author | Sebastian Dröge <sebastian@centricular.com> | 2015-02-19 01:21:47 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2015-02-19 01:22:26 +0200 |
| commit | 5da04ca3c70a2eec951c334ed3176b8ce60fcd3d (patch) | |
| tree | 34748b061cce20269cc7969b893f35831f190552 | |
| parent | f0f6bd4910e340cbaf00a23e8b17860b637ef960 (diff) | |
uridecodebin: Let the latency query fail if one of the source queries fails
| -rw-r--r-- | gst/playback/gsturidecodebin.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/gst/playback/gsturidecodebin.c b/gst/playback/gsturidecodebin.c index 3714553b5..5c9d51995 100644 --- a/gst/playback/gsturidecodebin.c +++ b/gst/playback/gsturidecodebin.c @@ -2556,8 +2556,6 @@ decoder_query_latency_fold (const GValue * item, GValue * ret, QueryFold * fold) GstClockTime min, max; gboolean live; - g_value_set_boolean (ret, TRUE); - gst_query_parse_latency (fold->query, &live, &min, &max); GST_DEBUG_OBJECT (pad, @@ -2576,6 +2574,9 @@ decoder_query_latency_fold (const GValue * item, GValue * ret, QueryFold * fold) fold->live = TRUE; } + } else { + GST_LOG_OBJECT (pad, "latency query failed"); + g_value_set_boolean (ret, FALSE); } return TRUE; @@ -2656,6 +2657,7 @@ gst_uri_decode_bin_query (GstElement * element, GstQuery * query) QueryDoneFunction fold_done = NULL; QueryFold fold_data; GValue ret = { 0 }; + gboolean default_ret = FALSE; decoder = GST_URI_DECODE_BIN (element); @@ -2677,6 +2679,7 @@ gst_uri_decode_bin_query (GstElement * element, GstQuery * query) fold_func = (GstIteratorFoldFunction) decoder_query_latency_fold; fold_init = decoder_query_init; fold_done = decoder_query_latency_done; + default_ret = TRUE; break; case GST_QUERY_SEEKING: /* iterate and collect durations */ @@ -2692,7 +2695,7 @@ gst_uri_decode_bin_query (GstElement * element, GstQuery * query) fold_data.query = query; g_value_init (&ret, G_TYPE_BOOLEAN); - g_value_set_boolean (&ret, FALSE); + g_value_set_boolean (&ret, default_ret); iter = gst_element_iterate_src_pads (element); GST_DEBUG_OBJECT (element, "Sending query %p (type %d) to src pads", |