projects
/
platform
/
upstream
/
gstreamer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a42c474
)
aggregator: Fail the latency query if one of the upstream queries fails
author
Sebastian Dröge
<sebastian@centricular.com>
Wed, 18 Feb 2015 23:28:06 +0000
(
01:28
+0200)
committer
Tim-Philipp Müller
<tim@centricular.com>
Sat, 2 Dec 2017 15:10:26 +0000
(15:10 +0000)
libs/gst/base/gstaggregator.c
patch
|
blob
|
history
diff --git
a/libs/gst/base/gstaggregator.c
b/libs/gst/base/gstaggregator.c
index
0034b77
..
3ae43dc
100644
(file)
--- a/
libs/gst/base/gstaggregator.c
+++ b/
libs/gst/base/gstaggregator.c
@@
-1117,6
+1117,7
@@
typedef struct
{
GstClockTime min, max;
gboolean live;
+ gboolean res;
} LatencyData;
static gboolean
@@
-1148,6
+1149,9
@@
gst_aggregator_query_sink_latency_foreach (GstAggregator * self,
data->live = TRUE;
}
+ } else {
+ GST_LOG_OBJECT (pad, "latency query failed");
+ data->res = FALSE;
}
gst_query_unref (query);
@@
-1207,6
+1211,7
@@
gst_aggregator_query_latency (GstAggregator * self, GstQuery * query)
data.min = 0;
data.max = GST_CLOCK_TIME_NONE;
data.live = FALSE;
+ data.res = TRUE;
/* query upstream's latency */
SRC_LOCK (self);
@@
-1262,7
+1267,7
@@
gst_aggregator_query_latency (GstAggregator * self, GstQuery * query)
gst_query_set_latency (query, data.live, data.min, data.max);
- return
TRUE
;
+ return
data.res
;
}
static gboolean