mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 07:58:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

adaptive_demux: tests: improved validation of pads

Browse source 
When removing a pad, the on_demuxPadRemoved function must find a stream
for that pad.

https://bugzilla.gnome.org/show_bug.cgi?id=760328
This commit is contained in:
Florin Apostol 2016-01-07 12:50:06 +00:00 committed by Thiago Santos
parent 7ed4f6f03f
commit 13f66a68ed
1 changed files with 17 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
tests/check/elements/adaptive_demux_engine.c
View file

@ -344,33 +344,29 @@ on_demuxPadRemoved (GstElement * demux, GstPad * pad, gpointer user_data)
GstAdaptiveDemuxTestEnginePrivate *priv = GstAdaptiveDemuxTestEnginePrivate *priv =
(GstAdaptiveDemuxTestEnginePrivate *) user_data; (GstAdaptiveDemuxTestEnginePrivate *) user_data;
GstAdaptiveDemuxTestOutputStream *stream = NULL; GstAdaptiveDemuxTestOutputStream *stream = NULL;
GstStateChangeReturn ret;
GstState currentState, pending;
GstElement *appSink;
fail_unless (priv != NULL); fail_unless (priv != NULL);
GST_DEBUG ("Pad removed: %" GST_PTR_FORMAT, pad); GST_DEBUG ("Pad removed: %" GST_PTR_FORMAT, pad);
GST_TEST_LOCK (priv); GST_TEST_LOCK (priv);
stream = getTestOutputDataByPad (priv, pad, FALSE); stream = getTestOutputDataByPad (priv, pad, TRUE);
if (stream) { if (priv->callbacks->demux_pad_removed) {
GstStateChangeReturn ret; priv->callbacks->demux_pad_removed (&priv->engine, stream, priv->user_data);
GstState currentState, pending; }
GstElement *appSink; fail_unless (stream->appsink != NULL);
fail_unless (stream->internal_pad != NULL);
if (priv->callbacks->demux_pad_removed) { gst_object_unref (stream->internal_pad);
priv->callbacks->demux_pad_removed (&priv->engine, stream, stream->internal_pad = NULL;
priv->user_data); appSink = GST_ELEMENT (stream->appsink);
} ret = gst_element_get_state (appSink, &currentState, &pending, 0);
fail_unless (stream->appsink != NULL); if ((ret == GST_STATE_CHANGE_SUCCESS && currentState == GST_STATE_PLAYING)
fail_unless (stream->internal_pad != NULL); || (ret == GST_STATE_CHANGE_ASYNC && pending == GST_STATE_PLAYING)) {
gst_object_unref (stream->internal_pad); GST_DEBUG ("Changing AppSink element to PAUSED");
stream->internal_pad = NULL; gst_element_set_state (appSink, GST_STATE_PAUSED);
appSink = GST_ELEMENT (stream->appsink);
ret = gst_element_get_state (appSink, &currentState, &pending, 0);
if ((ret == GST_STATE_CHANGE_SUCCESS && currentState == GST_STATE_PLAYING)
|| (ret == GST_STATE_CHANGE_ASYNC && pending == GST_STATE_PLAYING)) {
GST_DEBUG ("Changing AppSink element to PAUSED");
gst_element_set_state (appSink, GST_STATE_PAUSED);
}
} }
GST_TEST_UNLOCK (priv); GST_TEST_UNLOCK (priv);
} }