mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-02 16:52:42 +00:00
Code Issues 1 Projects Releases Wiki Activity

aggregator: register func for do_events_and_queries

Browse source 
This fixes logging the func ptr from _iterate_sinkpads().
This commit is contained in:
Stefan Sauer 2017-09-17 12:37:03 -07:00 committed by Tim-Philipp Müller
parent bedc9de46c
commit 70d0945b35
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libs/gst/base/gstaggregator.c
View file

@ -750,8 +750,8 @@ gst_aggregator_wait_and_check (GstAggregator * self, gboolean * timeout)
} }
static gboolean static gboolean
do_events_and_queries (GstAggregator * self, GstAggregatorPad * pad, gst_aggregator_do_events_and_queries (GstAggregator * self,
gpointer user_data) GstAggregatorPad * pad, gpointer user_data)
{ {
GstEvent *event = NULL; GstEvent *event = NULL;
GstQuery *query = NULL; GstQuery *query = NULL;
@ -1096,12 +1096,13 @@ gst_aggregator_aggregate_func (GstAggregator * self)
GstFlowReturn flow_return = GST_FLOW_OK; GstFlowReturn flow_return = GST_FLOW_OK;
gboolean processed_event = FALSE; gboolean processed_event = FALSE;
gst_aggregator_iterate_sinkpads (self, do_events_and_queries, NULL); gst_aggregator_iterate_sinkpads (self, gst_aggregator_do_events_and_queries,
NULL);
if (!gst_aggregator_wait_and_check (self, &timeout)) if (!gst_aggregator_wait_and_check (self, &timeout))
continue; continue;
gst_aggregator_iterate_sinkpads (self, do_events_and_queries, gst_aggregator_iterate_sinkpads (self, gst_aggregator_do_events_and_queries,
&processed_event); &processed_event);
if (processed_event) if (processed_event)
continue; continue;
@ -2361,6 +2362,7 @@ gst_aggregator_class_init (GstAggregatorClass * klass)
DEFAULT_START_TIME, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); DEFAULT_START_TIME, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
GST_DEBUG_REGISTER_FUNCPTR (gst_aggregator_stop_pad); GST_DEBUG_REGISTER_FUNCPTR (gst_aggregator_stop_pad);
GST_DEBUG_REGISTER_FUNCPTR (gst_aggregator_do_events_and_queries);
} }
static void static void