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

check: Fix usage of dual probes

Browse source 
Using two (or more) probes on the same pad where one of the probe
returns HANDLED or DROP is tricky since the other probes might
not be called.

Instead use regular probes and a proper pad (the sinkpad already existed,
it only required to be activated and have a dummy chain function for
the events/buffers to be received/handled properly)
This commit is contained in:
Edward Hervey 2017-09-05 14:26:52 +02:00 committed by Tim-Philipp Müller
parent 2cd988e763
commit ab4dd3f577
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
tests/check/libs/aggregator.c
View file

@ -341,12 +341,10 @@ downstream_probe_cb (GstPad * pad, GstPadProbeInfo * info, TestData * test)
GST_EVENT_FLUSH_STOP)
g_atomic_int_inc (&test->flush_stop_events);
}
gst_mini_object_unref (info->data);
return GST_PAD_PROBE_HANDLED;
return GST_PAD_PROBE_OK;
}
/*
* Not thread safe, will create a new ChainData which contains
* an activated src pad linked to a requested sink pad of @agg, and
@ -382,6 +380,14 @@ _chain_data_clear (ChainData * data)
gst_object_unref (data->sinkpad);
}
static GstFlowReturn
_test_chain (GstPad * pad, GstObject * object, GstBuffer * buffer)
{
/* accept any buffers */
gst_buffer_unref (buffer);
return GST_FLOW_OK;
}
static void
_test_data_init (TestData * test, gboolean needs_flushing)
{
@ -398,11 +404,11 @@ _test_data_init (TestData * test, gboolean needs_flushing)
num_sink_pads += 1;
test->sinkpad = gst_pad_new_from_static_template (&sinktemplate, pad_name);
gst_pad_set_chain_function (test->sinkpad, _test_chain);
gst_pad_set_active (test->sinkpad, TRUE);
g_free (pad_name);
fail_unless (gst_pad_link (test->srcpad, test->sinkpad) == GST_PAD_LINK_OK);
gst_pad_add_probe (test->srcpad, GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM |
GST_PAD_PROBE_TYPE_DATA_DOWNSTREAM |
GST_PAD_PROBE_TYPE_EVENT_FLUSH,
gst_pad_add_probe (test->srcpad, GST_PAD_PROBE_TYPE_EVENT_FLUSH,
(GstPadProbeCallback) downstream_probe_cb, test, NULL);
} else {
gst_pad_add_probe (test->srcpad, GST_PAD_PROBE_TYPE_BUFFER,