diff options
| author | Florin Apostol <florin.apostol@oregan.net> | 2016-01-07 12:48:12 +0000 |
|---|---|---|
| committer | Thiago Santos <thiagoss@osg.samsung.com> | 2016-02-09 09:59:47 -0300 |
| commit | 7ed4f6f03fb374828dad06810c01341537cf4f92 (patch) | |
| tree | 54e15c75b8c31cd80c1d144bcd0fff86847ff938 /tests | |
| parent | 97c562ecbf2120bcdc99761f29026f5e64c3c992 (diff) | |
| download | gstreamer-plugins-bad-7ed4f6f03fb374828dad06810c01341537cf4f92.tar.gz | |
adaptive_demux: tests: fix pad used for AppSink event
on_demuxNewPad registered the on_appsink_event callback on a wrong pad.
https://bugzilla.gnome.org/show_bug.cgi?id=760328
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/check/elements/adaptive_demux_engine.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tests/check/elements/adaptive_demux_engine.c b/tests/check/elements/adaptive_demux_engine.c index a78d7419f..6bef4161c 100644 --- a/tests/check/elements/adaptive_demux_engine.c +++ b/tests/check/elements/adaptive_demux_engine.c @@ -155,9 +155,13 @@ on_appsink_event (GstPad * pad, GstPadProbeInfo * info, gpointer data) event, pad); if (priv->callbacks->appsink_event) { + GstPad *stream_pad = gst_pad_get_peer (pad); + fail_unless (stream_pad != NULL); + GST_TEST_LOCK (priv); - stream = getTestOutputDataByPad (priv, pad, TRUE); + stream = getTestOutputDataByPad (priv, stream_pad, TRUE); GST_TEST_UNLOCK (priv); + gst_object_unref (stream_pad); priv->callbacks->appsink_event (&priv->engine, stream, event, priv->user_data); } @@ -297,7 +301,7 @@ on_demuxNewPad (GstElement * demux, GstPad * pad, gpointer user_data) gst_app_sink_set_callbacks (GST_APP_SINK (sink), &appSinkCallbacks, priv, NULL); appsink_pad = gst_element_get_static_pad (sink, "sink"); - gst_pad_add_probe (pad, + gst_pad_add_probe (appsink_pad, GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM | GST_PAD_PROBE_TYPE_EVENT_FLUSH, (GstPadProbeCallback) on_appsink_event, priv, NULL); gst_object_unref (appsink_pad); |