mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-15 22:01:27 +00:00
Code Issues 1 Projects Releases Wiki Activity

-base: change for changed set_blocked API

Browse source
This commit is contained in:
Wim Taymans 2011-05-26 16:08:44 +02:00
parent bf08ca7020
commit 8501753033
7 changed files with 74 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gst/playback/gstdecodebin2.c
View file

@ -3511,7 +3511,7 @@ gst_decode_pad_set_blocked (GstDecodePad * dpad, gboolean blocked)
/* do not block if shutting down. /* do not block if shutting down.
* we do not consider/expect it blocked further below, but use other trick */ * we do not consider/expect it blocked further below, but use other trick */
if (!blocked || !dbin->shutdown) if (!blocked || !dbin->shutdown)
gst_pad_set_blocked_async_full (opad, blocked, gst_pad_set_blocked (opad, blocked,
(GstPadBlockCallback) source_pad_blocked_cb, gst_object_ref (dpad), (GstPadBlockCallback) source_pad_blocked_cb, gst_object_ref (dpad),
(GDestroyNotify) gst_object_unref); (GDestroyNotify) gst_object_unref);
@ -3671,7 +3671,7 @@ unblock_pads (GstDecodeBin * dbin)
continue; continue;
GST_DEBUG_OBJECT (dpad, "unblocking"); GST_DEBUG_OBJECT (dpad, "unblocking");
gst_pad_set_blocked_async_full (opad, FALSE, gst_pad_set_blocked (opad, FALSE,
(GstPadBlockCallback) source_pad_blocked_cb, gst_object_ref (dpad), (GstPadBlockCallback) source_pad_blocked_cb, gst_object_ref (dpad),
(GDestroyNotify) gst_object_unref); (GDestroyNotify) gst_object_unref);
/* make flushing, prevent NOT_LINKED */ /* make flushing, prevent NOT_LINKED */

20
gst/playback/gstplaybin.c
View file

@ -511,8 +511,8 @@ gst_play_bin_vis_unblocked (GstPad * tee_pad, gboolean blocked,
GstPlayBin *play_bin = GST_PLAY_BIN (user_data); GstPlayBin *play_bin = GST_PLAY_BIN (user_data);
if (play_bin->pending_visualisation) if (play_bin->pending_visualisation)
gst_pad_set_blocked_async (tee_pad, FALSE, gst_play_bin_vis_unblocked, gst_pad_set_blocked (tee_pad, FALSE, gst_play_bin_vis_unblocked,
play_bin); play_bin, NULL);
} }
static void static void
@ -619,8 +619,8 @@ beach:
} }
/* Unblock the pad */ /* Unblock the pad */
gst_pad_set_blocked_async (tee_pad, FALSE, gst_play_bin_vis_unblocked, gst_pad_set_blocked (tee_pad, FALSE, gst_play_bin_vis_unblocked,
play_bin); play_bin, NULL);
} }
static void static void
@ -702,8 +702,8 @@ gst_play_bin_set_property (GObject * object, guint prop_id,
play_bin->pending_visualisation = pending_visualisation; play_bin->pending_visualisation = pending_visualisation;
/* Block with callback */ /* Block with callback */
gst_pad_set_blocked_async (tee_pad, TRUE, gst_play_bin_vis_blocked, gst_pad_set_blocked (tee_pad, TRUE, gst_play_bin_vis_blocked,
play_bin); play_bin, NULL);
beach: beach:
if (vis_sink_pad) { if (vis_sink_pad) {
gst_object_unref (vis_sink_pad); gst_object_unref (vis_sink_pad);
@ -1667,7 +1667,7 @@ setup_sinks (GstPlayBaseBin * play_base_bin, GstPlayBaseGroup * group)
"file, ghosting to a suitable hierarchy"); "file, ghosting to a suitable hierarchy");
/* Block the pad first, because as soon as we add a ghostpad, the queue /* Block the pad first, because as soon as we add a ghostpad, the queue
* will try and start pushing */ * will try and start pushing */
gst_pad_set_blocked_async (textsrcpad, TRUE, dummy_blocked_cb, NULL); gst_pad_set_blocked (textsrcpad, TRUE, dummy_blocked_cb, NULL, NULL);
origtextsrcpad = gst_object_ref (textsrcpad); origtextsrcpad = gst_object_ref (textsrcpad);
ghost = gst_ghost_pad_new ("text_src", textsrcpad); ghost = gst_ghost_pad_new ("text_src", textsrcpad);
@ -1711,7 +1711,7 @@ setup_sinks (GstPlayBaseBin * play_base_bin, GstPlayBaseGroup * group)
if (textsrcpad) if (textsrcpad)
gst_object_unref (textsrcpad); gst_object_unref (textsrcpad);
if (origtextsrcpad) { if (origtextsrcpad) {
gst_pad_set_blocked_async (origtextsrcpad, FALSE, dummy_blocked_cb, NULL); gst_pad_set_blocked (origtextsrcpad, FALSE, dummy_blocked_cb, NULL, NULL);
gst_object_unref (origtextsrcpad); gst_object_unref (origtextsrcpad);
} }
@ -1726,12 +1726,12 @@ setup_sinks (GstPlayBaseBin * play_base_bin, GstPlayBaseGroup * group)
spu_sink_pad = gst_element_get_static_pad (sink, "subpicture_sink"); spu_sink_pad = gst_element_get_static_pad (sink, "subpicture_sink");
if (subpic_pad && spu_sink_pad) { if (subpic_pad && spu_sink_pad) {
GST_LOG_OBJECT (play_bin, "Linking DVD subpicture stream onto SPU"); GST_LOG_OBJECT (play_bin, "Linking DVD subpicture stream onto SPU");
gst_pad_set_blocked_async (subpic_pad, TRUE, dummy_blocked_cb, NULL); gst_pad_set_blocked (subpic_pad, TRUE, dummy_blocked_cb, NULL, NULL);
if (gst_pad_link (subpic_pad, spu_sink_pad) != GST_PAD_LINK_OK) { if (gst_pad_link (subpic_pad, spu_sink_pad) != GST_PAD_LINK_OK) {
GST_WARNING_OBJECT (play_bin, GST_WARNING_OBJECT (play_bin,
"Failed to link DVD subpicture stream onto SPU"); "Failed to link DVD subpicture stream onto SPU");
} }
gst_pad_set_blocked_async (subpic_pad, FALSE, dummy_blocked_cb, NULL); gst_pad_set_blocked (subpic_pad, FALSE, dummy_blocked_cb, NULL, NULL);
} }
if (subpic_pad) if (subpic_pad)
gst_object_unref (subpic_pad); gst_object_unref (subpic_pad);

14
gst/playback/gstplaybin2.c
View file

@ -1636,8 +1636,8 @@ gst_play_bin_suburidecodebin_block (GstElement * suburidecodebin,
switch (gst_iterator_next (it, &item)) { switch (gst_iterator_next (it, &item)) {
case GST_ITERATOR_OK: case GST_ITERATOR_OK:
sinkpad = g_value_get_object (&item); sinkpad = g_value_get_object (&item);
gst_pad_set_blocked_async (sinkpad, block, _suburidecodebin_blocked_cb, gst_pad_set_blocked (sinkpad, block, _suburidecodebin_blocked_cb,
NULL); NULL, NULL);
g_value_reset (&item); g_value_reset (&item);
break; break;
case GST_ITERATOR_DONE: case GST_ITERATOR_DONE:
@ -2547,7 +2547,7 @@ pad_added_cb (GstElement * decodebin, GstPad * pad, GstSourceGroup * group)
* streams and connect the sinks, resulting in not-linked errors. After we * streams and connect the sinks, resulting in not-linked errors. After we
* configured the sinks we will unblock them all. */ * configured the sinks we will unblock them all. */
GST_DEBUG_OBJECT (playbin, "blocking %" GST_PTR_FORMAT, select->srcpad); GST_DEBUG_OBJECT (playbin, "blocking %" GST_PTR_FORMAT, select->srcpad);
gst_pad_set_blocked_async (select->srcpad, TRUE, selector_blocked, NULL); gst_pad_set_blocked (select->srcpad, TRUE, selector_blocked, NULL, NULL);
} }
/* get sinkpad for the new stream */ /* get sinkpad for the new stream */
@ -2861,8 +2861,8 @@ no_more_pads_cb (GstElement * decodebin, GstSourceGroup * group)
if (select->srcpad) { if (select->srcpad) {
GST_DEBUG_OBJECT (playbin, "unblocking %" GST_PTR_FORMAT, GST_DEBUG_OBJECT (playbin, "unblocking %" GST_PTR_FORMAT,
select->srcpad); select->srcpad);
gst_pad_set_blocked_async (select->srcpad, FALSE, selector_blocked, gst_pad_set_blocked (select->srcpad, FALSE, selector_blocked,
NULL); NULL, NULL);
} }
} }
GST_SOURCE_GROUP_UNLOCK (group); GST_SOURCE_GROUP_UNLOCK (group);
@ -2894,8 +2894,8 @@ shutdown:
} }
GST_DEBUG_OBJECT (playbin, "unblocking %" GST_PTR_FORMAT, GST_DEBUG_OBJECT (playbin, "unblocking %" GST_PTR_FORMAT,
select->srcpad); select->srcpad);
gst_pad_set_blocked_async (select->srcpad, FALSE, selector_blocked, gst_pad_set_blocked (select->srcpad, FALSE, selector_blocked,
NULL); NULL, NULL);
} }
} }
GST_SOURCE_GROUP_UNLOCK (group); GST_SOURCE_GROUP_UNLOCK (group);

32
gst/playback/gstplaysink.c
View file

@ -713,8 +713,8 @@ gst_play_sink_vis_blocked (GstPad * tee_pad, gboolean blocked,
done: done:
/* Unblock the pad */ /* Unblock the pad */
gst_pad_set_blocked_async (tee_pad, FALSE, gst_play_sink_vis_unblocked, gst_pad_set_blocked (tee_pad, FALSE, gst_play_sink_vis_unblocked,
playsink); playsink, NULL);
GST_PLAY_SINK_UNLOCK (playsink); GST_PLAY_SINK_UNLOCK (playsink);
} }
@ -752,8 +752,8 @@ gst_play_sink_set_vis_plugin (GstPlaySink * playsink, GstElement * vis)
* function returns FALSE but the previous pad block will do the right thing * function returns FALSE but the previous pad block will do the right thing
* anyway. */ * anyway. */
GST_DEBUG_OBJECT (playsink, "blocking vis pad"); GST_DEBUG_OBJECT (playsink, "blocking vis pad");
gst_pad_set_blocked_async (chain->blockpad, TRUE, gst_play_sink_vis_blocked, gst_pad_set_blocked (chain->blockpad, TRUE, gst_play_sink_vis_blocked,
playsink); playsink, NULL);
done: done:
GST_PLAY_SINK_UNLOCK (playsink); GST_PLAY_SINK_UNLOCK (playsink);
@ -2920,7 +2920,7 @@ sinkpad_blocked_cb (GstPad * blockedpad, gboolean blocked, gpointer user_data)
GstPad *opad = GstPad *opad =
GST_PAD_CAST (gst_proxy_pad_get_internal (GST_PROXY_PAD GST_PAD_CAST (gst_proxy_pad_get_internal (GST_PROXY_PAD
(playsink->video_pad))); (playsink->video_pad)));
gst_pad_set_blocked_async_full (opad, FALSE, sinkpad_blocked_cb, gst_pad_set_blocked (opad, FALSE, sinkpad_blocked_cb,
gst_object_ref (playsink), (GDestroyNotify) gst_object_unref); gst_object_ref (playsink), (GDestroyNotify) gst_object_unref);
gst_object_unref (opad); gst_object_unref (opad);
} }
@ -2929,7 +2929,7 @@ sinkpad_blocked_cb (GstPad * blockedpad, gboolean blocked, gpointer user_data)
GstPad *opad = GstPad *opad =
GST_PAD_CAST (gst_proxy_pad_get_internal (GST_PROXY_PAD GST_PAD_CAST (gst_proxy_pad_get_internal (GST_PROXY_PAD
(playsink->audio_pad))); (playsink->audio_pad)));
gst_pad_set_blocked_async_full (opad, FALSE, sinkpad_blocked_cb, gst_pad_set_blocked (opad, FALSE, sinkpad_blocked_cb,
gst_object_ref (playsink), (GDestroyNotify) gst_object_unref); gst_object_ref (playsink), (GDestroyNotify) gst_object_unref);
gst_object_unref (opad); gst_object_unref (opad);
} }
@ -2938,7 +2938,7 @@ sinkpad_blocked_cb (GstPad * blockedpad, gboolean blocked, gpointer user_data)
GstPad *opad = GstPad *opad =
GST_PAD_CAST (gst_proxy_pad_get_internal (GST_PROXY_PAD GST_PAD_CAST (gst_proxy_pad_get_internal (GST_PROXY_PAD
(playsink->text_pad))); (playsink->text_pad)));
gst_pad_set_blocked_async_full (opad, FALSE, sinkpad_blocked_cb, gst_pad_set_blocked (opad, FALSE, sinkpad_blocked_cb,
gst_object_ref (playsink), (GDestroyNotify) gst_object_unref); gst_object_ref (playsink), (GDestroyNotify) gst_object_unref);
gst_object_unref (opad); gst_object_unref (opad);
} }
@ -2962,14 +2962,14 @@ caps_notify_cb (GstPad * pad, GParamSpec * unused, GstPlaySink * playsink)
if (pad == playsink->audio_pad) { if (pad == playsink->audio_pad) {
raw = is_raw_pad (pad); raw = is_raw_pad (pad);
reconfigure = (! !playsink->audio_pad_raw != ! !raw) reconfigure = (!!playsink->audio_pad_raw != !!raw)
&& playsink->audiochain; && playsink->audiochain;
GST_DEBUG_OBJECT (pad, GST_DEBUG_OBJECT (pad,
"Audio caps changed: raw %d reconfigure %d caps %" GST_PTR_FORMAT, raw, "Audio caps changed: raw %d reconfigure %d caps %" GST_PTR_FORMAT, raw,
reconfigure, caps); reconfigure, caps);
} else if (pad == playsink->video_pad) { } else if (pad == playsink->video_pad) {
raw = is_raw_pad (pad); raw = is_raw_pad (pad);
reconfigure = (! !playsink->video_pad_raw != ! !raw) reconfigure = (!!playsink->video_pad_raw != !!raw)
&& playsink->videochain; && playsink->videochain;
GST_DEBUG_OBJECT (pad, GST_DEBUG_OBJECT (pad,
"Video caps changed: raw %d reconfigure %d caps %" GST_PTR_FORMAT, raw, "Video caps changed: raw %d reconfigure %d caps %" GST_PTR_FORMAT, raw,
@ -2984,7 +2984,7 @@ caps_notify_cb (GstPad * pad, GParamSpec * unused, GstPlaySink * playsink)
GstPad *opad = GstPad *opad =
GST_PAD_CAST (gst_proxy_pad_get_internal (GST_PROXY_PAD GST_PAD_CAST (gst_proxy_pad_get_internal (GST_PROXY_PAD
(playsink->video_pad))); (playsink->video_pad)));
gst_pad_set_blocked_async_full (opad, TRUE, sinkpad_blocked_cb, gst_pad_set_blocked (opad, TRUE, sinkpad_blocked_cb,
gst_object_ref (playsink), (GDestroyNotify) gst_object_unref); gst_object_ref (playsink), (GDestroyNotify) gst_object_unref);
gst_object_unref (opad); gst_object_unref (opad);
} }
@ -2993,7 +2993,7 @@ caps_notify_cb (GstPad * pad, GParamSpec * unused, GstPlaySink * playsink)
GstPad *opad = GstPad *opad =
GST_PAD_CAST (gst_proxy_pad_get_internal (GST_PROXY_PAD GST_PAD_CAST (gst_proxy_pad_get_internal (GST_PROXY_PAD
(playsink->audio_pad))); (playsink->audio_pad)));
gst_pad_set_blocked_async_full (opad, TRUE, sinkpad_blocked_cb, gst_pad_set_blocked (opad, TRUE, sinkpad_blocked_cb,
gst_object_ref (playsink), (GDestroyNotify) gst_object_unref); gst_object_ref (playsink), (GDestroyNotify) gst_object_unref);
gst_object_unref (opad); gst_object_unref (opad);
} }
@ -3002,7 +3002,7 @@ caps_notify_cb (GstPad * pad, GParamSpec * unused, GstPlaySink * playsink)
GstPad *opad = GstPad *opad =
GST_PAD_CAST (gst_proxy_pad_get_internal (GST_PROXY_PAD GST_PAD_CAST (gst_proxy_pad_get_internal (GST_PROXY_PAD
(playsink->text_pad))); (playsink->text_pad)));
gst_pad_set_blocked_async_full (opad, TRUE, sinkpad_blocked_cb, gst_pad_set_blocked (opad, TRUE, sinkpad_blocked_cb,
gst_object_ref (playsink), (GDestroyNotify) gst_object_unref); gst_object_ref (playsink), (GDestroyNotify) gst_object_unref);
gst_object_unref (opad); gst_object_unref (opad);
} }
@ -3117,7 +3117,7 @@ gst_play_sink_request_pad (GstPlaySink * playsink, GstPlaySinkType type)
GstPad *blockpad = GstPad *blockpad =
GST_PAD_CAST (gst_proxy_pad_get_internal (GST_PROXY_PAD (res))); GST_PAD_CAST (gst_proxy_pad_get_internal (GST_PROXY_PAD (res)));
gst_pad_set_blocked_async_full (blockpad, TRUE, sinkpad_blocked_cb, gst_pad_set_blocked (blockpad, TRUE, sinkpad_blocked_cb,
gst_object_ref (playsink), (GDestroyNotify) gst_object_unref); gst_object_ref (playsink), (GDestroyNotify) gst_object_unref);
gst_object_unref (blockpad); gst_object_unref (blockpad);
} }
@ -3370,7 +3370,7 @@ gst_play_sink_change_state (GstElement * element, GstStateChange transition)
GST_PAD_CAST (gst_proxy_pad_get_internal (GST_PROXY_PAD GST_PAD_CAST (gst_proxy_pad_get_internal (GST_PROXY_PAD
(playsink->video_pad))); (playsink->video_pad)));
if (gst_pad_is_blocked (opad)) { if (gst_pad_is_blocked (opad)) {
gst_pad_set_blocked_async_full (opad, FALSE, sinkpad_blocked_cb, gst_pad_set_blocked (opad, FALSE, sinkpad_blocked_cb,
gst_object_ref (playsink), (GDestroyNotify) gst_object_unref); gst_object_ref (playsink), (GDestroyNotify) gst_object_unref);
} }
gst_object_unref (opad); gst_object_unref (opad);
@ -3383,7 +3383,7 @@ gst_play_sink_change_state (GstElement * element, GstStateChange transition)
(playsink->audio_pad))); (playsink->audio_pad)));
if (gst_pad_is_blocked (opad)) { if (gst_pad_is_blocked (opad)) {
gst_pad_set_blocked_async_full (opad, FALSE, sinkpad_blocked_cb, gst_pad_set_blocked (opad, FALSE, sinkpad_blocked_cb,
gst_object_ref (playsink), (GDestroyNotify) gst_object_unref); gst_object_ref (playsink), (GDestroyNotify) gst_object_unref);
} }
gst_object_unref (opad); gst_object_unref (opad);
@ -3395,7 +3395,7 @@ gst_play_sink_change_state (GstElement * element, GstStateChange transition)
GST_PAD_CAST (gst_proxy_pad_get_internal (GST_PROXY_PAD GST_PAD_CAST (gst_proxy_pad_get_internal (GST_PROXY_PAD
(playsink->text_pad))); (playsink->text_pad)));
if (gst_pad_is_blocked (opad)) { if (gst_pad_is_blocked (opad)) {
gst_pad_set_blocked_async_full (opad, FALSE, sinkpad_blocked_cb, gst_pad_set_blocked (opad, FALSE, sinkpad_blocked_cb,
gst_object_ref (playsink), (GDestroyNotify) gst_object_unref); gst_object_ref (playsink), (GDestroyNotify) gst_object_unref);
} }
gst_object_unref (opad); gst_object_unref (opad);

12
gst/playback/gstplaysinkaudioconvert.c
View file

@ -206,7 +206,7 @@ pad_blocked_cb (GstPad * pad, gboolean blocked, GstPlaySinkAudioConvert * self)
} }
unblock: unblock:
gst_pad_set_blocked_async_full (self->sink_proxypad, FALSE, gst_pad_set_blocked (self->sink_proxypad, FALSE,
(GstPadBlockCallback) pad_blocked_cb, gst_object_ref (self), (GstPadBlockCallback) pad_blocked_cb, gst_object_ref (self),
(GDestroyNotify) gst_object_unref); (GDestroyNotify) gst_object_unref);
@ -220,7 +220,7 @@ link_failed:
(NULL), ("Failed to configure the audio converter.")); (NULL), ("Failed to configure the audio converter."));
gst_ghost_pad_set_target (GST_GHOST_PAD_CAST (self->srcpad), gst_ghost_pad_set_target (GST_GHOST_PAD_CAST (self->srcpad),
self->sink_proxypad); self->sink_proxypad);
gst_pad_set_blocked_async_full (self->sink_proxypad, FALSE, gst_pad_set_blocked (self->sink_proxypad, FALSE,
(GstPadBlockCallback) pad_blocked_cb, gst_object_ref (self), (GstPadBlockCallback) pad_blocked_cb, gst_object_ref (self),
(GDestroyNotify) gst_object_unref); (GDestroyNotify) gst_object_unref);
return; return;
@ -275,7 +275,7 @@ gst_play_sink_audio_convert_sink_setcaps (GstPad * pad, GstCaps * caps)
if (!self->raw && !gst_pad_is_blocked (self->sink_proxypad)) { if (!self->raw && !gst_pad_is_blocked (self->sink_proxypad)) {
GST_DEBUG_OBJECT (self, "Changing caps from non-raw to raw"); GST_DEBUG_OBJECT (self, "Changing caps from non-raw to raw");
reconfigure = TRUE; reconfigure = TRUE;
gst_pad_set_blocked_async_full (self->sink_proxypad, TRUE, gst_pad_set_blocked (self->sink_proxypad, TRUE,
(GstPadBlockCallback) pad_blocked_cb, gst_object_ref (self), (GstPadBlockCallback) pad_blocked_cb, gst_object_ref (self),
(GDestroyNotify) gst_object_unref); (GDestroyNotify) gst_object_unref);
} }
@ -283,7 +283,7 @@ gst_play_sink_audio_convert_sink_setcaps (GstPad * pad, GstCaps * caps)
if (self->raw && !gst_pad_is_blocked (self->sink_proxypad)) { if (self->raw && !gst_pad_is_blocked (self->sink_proxypad)) {
GST_DEBUG_OBJECT (self, "Changing caps from raw to non-raw"); GST_DEBUG_OBJECT (self, "Changing caps from raw to non-raw");
reconfigure = TRUE; reconfigure = TRUE;
gst_pad_set_blocked_async_full (self->sink_proxypad, TRUE, gst_pad_set_blocked (self->sink_proxypad, TRUE,
(GstPadBlockCallback) pad_blocked_cb, gst_object_ref (self), (GstPadBlockCallback) pad_blocked_cb, gst_object_ref (self),
(GDestroyNotify) gst_object_unref); (GDestroyNotify) gst_object_unref);
} }
@ -360,7 +360,7 @@ gst_play_sink_audio_convert_change_state (GstElement * element,
case GST_STATE_CHANGE_PAUSED_TO_READY: case GST_STATE_CHANGE_PAUSED_TO_READY:
GST_PLAY_SINK_AUDIO_CONVERT_LOCK (self); GST_PLAY_SINK_AUDIO_CONVERT_LOCK (self);
if (gst_pad_is_blocked (self->sink_proxypad)) if (gst_pad_is_blocked (self->sink_proxypad))
gst_pad_set_blocked_async_full (self->sink_proxypad, FALSE, gst_pad_set_blocked (self->sink_proxypad, FALSE,
(GstPadBlockCallback) pad_blocked_cb, gst_object_ref (self), (GstPadBlockCallback) pad_blocked_cb, gst_object_ref (self),
(GDestroyNotify) gst_object_unref); (GDestroyNotify) gst_object_unref);
GST_PLAY_SINK_AUDIO_CONVERT_UNLOCK (self); GST_PLAY_SINK_AUDIO_CONVERT_UNLOCK (self);
@ -401,7 +401,7 @@ gst_play_sink_audio_convert_change_state (GstElement * element,
case GST_STATE_CHANGE_READY_TO_PAUSED: case GST_STATE_CHANGE_READY_TO_PAUSED:
GST_PLAY_SINK_AUDIO_CONVERT_LOCK (self); GST_PLAY_SINK_AUDIO_CONVERT_LOCK (self);
if (!gst_pad_is_blocked (self->sink_proxypad)) if (!gst_pad_is_blocked (self->sink_proxypad))
gst_pad_set_blocked_async_full (self->sink_proxypad, TRUE, gst_pad_set_blocked (self->sink_proxypad, TRUE,
(GstPadBlockCallback) pad_blocked_cb, gst_object_ref (self), (GstPadBlockCallback) pad_blocked_cb, gst_object_ref (self),
(GDestroyNotify) gst_object_unref); (GDestroyNotify) gst_object_unref);
GST_PLAY_SINK_AUDIO_CONVERT_UNLOCK (self); GST_PLAY_SINK_AUDIO_CONVERT_UNLOCK (self);

12
gst/playback/gstplaysinkvideoconvert.c
View file

@ -187,7 +187,7 @@ pad_blocked_cb (GstPad * pad, gboolean blocked, GstPlaySinkVideoConvert * self)
} }
unblock: unblock:
gst_pad_set_blocked_async_full (self->sink_proxypad, FALSE, gst_pad_set_blocked (self->sink_proxypad, FALSE,
(GstPadBlockCallback) pad_blocked_cb, gst_object_ref (self), (GstPadBlockCallback) pad_blocked_cb, gst_object_ref (self),
(GDestroyNotify) gst_object_unref); (GDestroyNotify) gst_object_unref);
@ -201,7 +201,7 @@ link_failed:
(NULL), ("Failed to configure the video converter.")); (NULL), ("Failed to configure the video converter."));
gst_ghost_pad_set_target (GST_GHOST_PAD_CAST (self->srcpad), gst_ghost_pad_set_target (GST_GHOST_PAD_CAST (self->srcpad),
self->sink_proxypad); self->sink_proxypad);
gst_pad_set_blocked_async_full (self->sink_proxypad, FALSE, gst_pad_set_blocked (self->sink_proxypad, FALSE,
(GstPadBlockCallback) pad_blocked_cb, gst_object_ref (self), (GstPadBlockCallback) pad_blocked_cb, gst_object_ref (self),
(GDestroyNotify) gst_object_unref); (GDestroyNotify) gst_object_unref);
return; return;
@ -257,7 +257,7 @@ gst_play_sink_video_convert_sink_setcaps (GstPad * pad, GstCaps * caps)
if (!self->raw && !gst_pad_is_blocked (self->sink_proxypad)) { if (!self->raw && !gst_pad_is_blocked (self->sink_proxypad)) {
GST_DEBUG_OBJECT (self, "Changing caps from non-raw to raw"); GST_DEBUG_OBJECT (self, "Changing caps from non-raw to raw");
reconfigure = TRUE; reconfigure = TRUE;
gst_pad_set_blocked_async_full (self->sink_proxypad, TRUE, gst_pad_set_blocked (self->sink_proxypad, TRUE,
(GstPadBlockCallback) pad_blocked_cb, gst_object_ref (self), (GstPadBlockCallback) pad_blocked_cb, gst_object_ref (self),
(GDestroyNotify) gst_object_unref); (GDestroyNotify) gst_object_unref);
} }
@ -265,7 +265,7 @@ gst_play_sink_video_convert_sink_setcaps (GstPad * pad, GstCaps * caps)
if (self->raw && !gst_pad_is_blocked (self->sink_proxypad)) { if (self->raw && !gst_pad_is_blocked (self->sink_proxypad)) {
GST_DEBUG_OBJECT (self, "Changing caps from raw to non-raw"); GST_DEBUG_OBJECT (self, "Changing caps from raw to non-raw");
reconfigure = TRUE; reconfigure = TRUE;
gst_pad_set_blocked_async_full (self->sink_proxypad, TRUE, gst_pad_set_blocked (self->sink_proxypad, TRUE,
(GstPadBlockCallback) pad_blocked_cb, gst_object_ref (self), (GstPadBlockCallback) pad_blocked_cb, gst_object_ref (self),
(GDestroyNotify) gst_object_unref); (GDestroyNotify) gst_object_unref);
} }
@ -339,7 +339,7 @@ gst_play_sink_video_convert_change_state (GstElement * element,
case GST_STATE_CHANGE_PAUSED_TO_READY: case GST_STATE_CHANGE_PAUSED_TO_READY:
GST_PLAY_SINK_VIDEO_CONVERT_LOCK (self); GST_PLAY_SINK_VIDEO_CONVERT_LOCK (self);
if (gst_pad_is_blocked (self->sink_proxypad)) if (gst_pad_is_blocked (self->sink_proxypad))
gst_pad_set_blocked_async_full (self->sink_proxypad, FALSE, gst_pad_set_blocked (self->sink_proxypad, FALSE,
(GstPadBlockCallback) pad_blocked_cb, gst_object_ref (self), (GstPadBlockCallback) pad_blocked_cb, gst_object_ref (self),
(GDestroyNotify) gst_object_unref); (GDestroyNotify) gst_object_unref);
GST_PLAY_SINK_VIDEO_CONVERT_UNLOCK (self); GST_PLAY_SINK_VIDEO_CONVERT_UNLOCK (self);
@ -374,7 +374,7 @@ gst_play_sink_video_convert_change_state (GstElement * element,
case GST_STATE_CHANGE_READY_TO_PAUSED: case GST_STATE_CHANGE_READY_TO_PAUSED:
GST_PLAY_SINK_VIDEO_CONVERT_LOCK (self); GST_PLAY_SINK_VIDEO_CONVERT_LOCK (self);
if (!gst_pad_is_blocked (self->sink_proxypad)) if (!gst_pad_is_blocked (self->sink_proxypad))
gst_pad_set_blocked_async_full (self->sink_proxypad, TRUE, gst_pad_set_blocked (self->sink_proxypad, TRUE,
(GstPadBlockCallback) pad_blocked_cb, gst_object_ref (self), (GstPadBlockCallback) pad_blocked_cb, gst_object_ref (self),
(GDestroyNotify) gst_object_unref); (GDestroyNotify) gst_object_unref);
GST_PLAY_SINK_VIDEO_CONVERT_UNLOCK (self); GST_PLAY_SINK_VIDEO_CONVERT_UNLOCK (self);

54
gst/playback/gstsubtitleoverlay.c
View file

@ -590,12 +590,12 @@ _setup_passthrough (GstSubtitleOverlay * self)
out: out:
/* Unblock pads */ /* Unblock pads */
gst_pad_set_blocked_async_full (self->video_block_pad, FALSE, gst_pad_set_blocked (self->video_block_pad, FALSE,
_pad_blocked_cb, gst_object_ref (self), _pad_blocked_cb, gst_object_ref (self),
(GDestroyNotify) gst_object_unref); (GDestroyNotify) gst_object_unref);
if (self->subtitle_sink_blocked) if (self->subtitle_sink_blocked)
gst_pad_set_blocked_async_full (self->subtitle_block_pad, FALSE, gst_pad_set_blocked (self->subtitle_block_pad, FALSE,
_pad_blocked_cb, gst_object_ref (self), _pad_blocked_cb, gst_object_ref (self),
(GDestroyNotify) gst_object_unref); (GDestroyNotify) gst_object_unref);
@ -739,12 +739,12 @@ _pad_blocked_cb (GstPad * pad, gboolean blocked, gpointer user_data)
gst_object_unref (target); gst_object_unref (target);
/* Unblock pads */ /* Unblock pads */
gst_pad_set_blocked_async_full (self->video_block_pad, FALSE, gst_pad_set_blocked (self->video_block_pad, FALSE,
_pad_blocked_cb, gst_object_ref (self), _pad_blocked_cb, gst_object_ref (self),
(GDestroyNotify) gst_object_unref); (GDestroyNotify) gst_object_unref);
if (self->subtitle_sink_blocked) if (self->subtitle_sink_blocked)
gst_pad_set_blocked_async_full (self->subtitle_block_pad, FALSE, gst_pad_set_blocked (self->subtitle_block_pad, FALSE,
_pad_blocked_cb, gst_object_ref (self), _pad_blocked_cb, gst_object_ref (self),
(GDestroyNotify) gst_object_unref); (GDestroyNotify) gst_object_unref);
goto out; goto out;
@ -755,7 +755,7 @@ _pad_blocked_cb (GstPad * pad, gboolean blocked, gpointer user_data)
if (self->subtitle_sink_blocked && !self->video_sink_blocked) { if (self->subtitle_sink_blocked && !self->video_sink_blocked) {
GST_DEBUG_OBJECT (self, "Subtitle sink blocked but video not blocked"); GST_DEBUG_OBJECT (self, "Subtitle sink blocked but video not blocked");
gst_pad_set_blocked_async_full (self->video_block_pad, TRUE, gst_pad_set_blocked (self->video_block_pad, TRUE,
_pad_blocked_cb, gst_object_ref (self), _pad_blocked_cb, gst_object_ref (self),
(GDestroyNotify) gst_object_unref); (GDestroyNotify) gst_object_unref);
goto out; goto out;
@ -1204,10 +1204,10 @@ _pad_blocked_cb (GstPad * pad, gboolean blocked, gpointer user_data)
do_async_done (self); do_async_done (self);
} else { } else {
GST_DEBUG_OBJECT (self, "Everything worked, unblocking pads"); GST_DEBUG_OBJECT (self, "Everything worked, unblocking pads");
gst_pad_set_blocked_async_full (self->video_block_pad, FALSE, gst_pad_set_blocked (self->video_block_pad, FALSE,
_pad_blocked_cb, gst_object_ref (self), _pad_blocked_cb, gst_object_ref (self),
(GDestroyNotify) gst_object_unref); (GDestroyNotify) gst_object_unref);
gst_pad_set_blocked_async_full (self->subtitle_block_pad, FALSE, gst_pad_set_blocked (self->subtitle_block_pad, FALSE,
_pad_blocked_cb, gst_object_ref (self), _pad_blocked_cb, gst_object_ref (self),
(GDestroyNotify) gst_object_unref); (GDestroyNotify) gst_object_unref);
do_async_done (self); do_async_done (self);
@ -1238,10 +1238,10 @@ gst_subtitle_overlay_change_state (GstElement * element,
GST_SUBTITLE_OVERLAY_LOCK (self); GST_SUBTITLE_OVERLAY_LOCK (self);
/* Set the internal pads to blocking */ /* Set the internal pads to blocking */
gst_pad_set_blocked_async_full (self->video_block_pad, TRUE, gst_pad_set_blocked (self->video_block_pad, TRUE,
_pad_blocked_cb, gst_object_ref (self), _pad_blocked_cb, gst_object_ref (self),
(GDestroyNotify) gst_object_unref); (GDestroyNotify) gst_object_unref);
gst_pad_set_blocked_async_full (self->subtitle_block_pad, TRUE, gst_pad_set_blocked (self->subtitle_block_pad, TRUE,
_pad_blocked_cb, gst_object_ref (self), _pad_blocked_cb, gst_object_ref (self),
(GDestroyNotify) gst_object_unref); (GDestroyNotify) gst_object_unref);
GST_SUBTITLE_OVERLAY_UNLOCK (self); GST_SUBTITLE_OVERLAY_UNLOCK (self);
@ -1309,13 +1309,13 @@ gst_subtitle_overlay_change_state (GstElement * element,
/* Unblock pads */ /* Unblock pads */
if (self->video_block_pad) { if (self->video_block_pad) {
pad = self->video_block_pad; pad = self->video_block_pad;
gst_pad_set_blocked_async_full (pad, FALSE, _pad_blocked_cb, gst_pad_set_blocked (pad, FALSE, _pad_blocked_cb,
gst_object_ref (self), (GDestroyNotify) gst_object_unref); gst_object_ref (self), (GDestroyNotify) gst_object_unref);
} }
if (self->subtitle_block_pad) { if (self->subtitle_block_pad) {
pad = self->subtitle_block_pad; pad = self->subtitle_block_pad;
gst_pad_set_blocked_async_full (pad, FALSE, _pad_blocked_cb, gst_pad_set_blocked (pad, FALSE, _pad_blocked_cb,
gst_object_ref (self), (GDestroyNotify) gst_object_unref); gst_object_ref (self), (GDestroyNotify) gst_object_unref);
} }
@ -1375,11 +1375,11 @@ gst_subtitle_overlay_handle_message (GstBin * bin, GstMessage * message)
GST_SUBTITLE_OVERLAY_LOCK (self); GST_SUBTITLE_OVERLAY_LOCK (self);
self->subtitle_error = TRUE; self->subtitle_error = TRUE;
gst_pad_set_blocked_async_full (self->subtitle_block_pad, TRUE, gst_pad_set_blocked (self->subtitle_block_pad, TRUE,
_pad_blocked_cb, gst_object_ref (self), _pad_blocked_cb, gst_object_ref (self),
(GDestroyNotify) gst_object_unref); (GDestroyNotify) gst_object_unref);
gst_pad_set_blocked_async_full (self->video_block_pad, TRUE, gst_pad_set_blocked (self->video_block_pad, TRUE,
_pad_blocked_cb, gst_object_ref (self), _pad_blocked_cb, gst_object_ref (self),
(GDestroyNotify) gst_object_unref); (GDestroyNotify) gst_object_unref);
GST_SUBTITLE_OVERLAY_UNLOCK (self); GST_SUBTITLE_OVERLAY_UNLOCK (self);
@ -1436,11 +1436,11 @@ gst_subtitle_overlay_set_property (GObject * object, guint prop_id,
else if (self->renderer) else if (self->renderer)
g_object_set (self->renderer, self->silent_property, silent, NULL); g_object_set (self->renderer, self->silent_property, silent, NULL);
} else { } else {
gst_pad_set_blocked_async_full (self->subtitle_block_pad, TRUE, gst_pad_set_blocked (self->subtitle_block_pad, TRUE,
_pad_blocked_cb, gst_object_ref (self), _pad_blocked_cb, gst_object_ref (self),
(GDestroyNotify) gst_object_unref); (GDestroyNotify) gst_object_unref);
gst_pad_set_blocked_async_full (self->video_block_pad, TRUE, gst_pad_set_blocked (self->video_block_pad, TRUE,
_pad_blocked_cb, gst_object_ref (self), _pad_blocked_cb, gst_object_ref (self),
(GDestroyNotify) gst_object_unref); (GDestroyNotify) gst_object_unref);
} }
@ -1673,11 +1673,11 @@ gst_subtitle_overlay_video_sink_chain (GstPad * pad, GstBuffer * buffer)
gst_flow_get_name (ret)); gst_flow_get_name (ret));
GST_SUBTITLE_OVERLAY_LOCK (self); GST_SUBTITLE_OVERLAY_LOCK (self);
self->subtitle_error = TRUE; self->subtitle_error = TRUE;
gst_pad_set_blocked_async_full (self->subtitle_block_pad, TRUE, gst_pad_set_blocked (self->subtitle_block_pad, TRUE,
_pad_blocked_cb, gst_object_ref (self), _pad_blocked_cb, gst_object_ref (self),
(GDestroyNotify) gst_object_unref); (GDestroyNotify) gst_object_unref);
gst_pad_set_blocked_async_full (self->video_block_pad, TRUE, gst_pad_set_blocked (self->video_block_pad, TRUE,
_pad_blocked_cb, gst_object_ref (self), _pad_blocked_cb, gst_object_ref (self),
(GDestroyNotify) gst_object_unref); (GDestroyNotify) gst_object_unref);
GST_SUBTITLE_OVERLAY_UNLOCK (self); GST_SUBTITLE_OVERLAY_UNLOCK (self);
@ -1704,11 +1704,11 @@ gst_subtitle_overlay_subtitle_sink_chain (GstPad * pad, GstBuffer * buffer)
gst_flow_get_name (ret)); gst_flow_get_name (ret));
GST_SUBTITLE_OVERLAY_LOCK (self); GST_SUBTITLE_OVERLAY_LOCK (self);
self->subtitle_error = TRUE; self->subtitle_error = TRUE;
gst_pad_set_blocked_async_full (self->subtitle_block_pad, TRUE, gst_pad_set_blocked (self->subtitle_block_pad, TRUE,
_pad_blocked_cb, gst_object_ref (self), _pad_blocked_cb, gst_object_ref (self),
(GDestroyNotify) gst_object_unref); (GDestroyNotify) gst_object_unref);
gst_pad_set_blocked_async_full (self->video_block_pad, TRUE, gst_pad_set_blocked (self->video_block_pad, TRUE,
_pad_blocked_cb, gst_object_ref (self), _pad_blocked_cb, gst_object_ref (self),
(GDestroyNotify) gst_object_unref); (GDestroyNotify) gst_object_unref);
GST_SUBTITLE_OVERLAY_UNLOCK (self); GST_SUBTITLE_OVERLAY_UNLOCK (self);
@ -1781,11 +1781,11 @@ gst_subtitle_overlay_subtitle_sink_setcaps (GstPad * pad, GstCaps * caps)
self->subtitle_error = FALSE; self->subtitle_error = FALSE;
gst_pad_set_blocked_async_full (self->subtitle_block_pad, TRUE, gst_pad_set_blocked (self->subtitle_block_pad, TRUE,
_pad_blocked_cb, gst_object_ref (self), _pad_blocked_cb, gst_object_ref (self),
(GDestroyNotify) gst_object_unref); (GDestroyNotify) gst_object_unref);
gst_pad_set_blocked_async_full (self->video_block_pad, TRUE, gst_pad_set_blocked (self->video_block_pad, TRUE,
_pad_blocked_cb, gst_object_ref (self), _pad_blocked_cb, gst_object_ref (self),
(GDestroyNotify) gst_object_unref); (GDestroyNotify) gst_object_unref);
GST_SUBTITLE_OVERLAY_UNLOCK (self); GST_SUBTITLE_OVERLAY_UNLOCK (self);
@ -1822,11 +1822,11 @@ gst_subtitle_overlay_subtitle_sink_link (GstPad * pad, GstPad * peer)
self->subtitle_error = FALSE; self->subtitle_error = FALSE;
gst_pad_set_blocked_async_full (self->subtitle_block_pad, TRUE, gst_pad_set_blocked (self->subtitle_block_pad, TRUE,
_pad_blocked_cb, gst_object_ref (self), _pad_blocked_cb, gst_object_ref (self),
(GDestroyNotify) gst_object_unref); (GDestroyNotify) gst_object_unref);
gst_pad_set_blocked_async_full (self->video_block_pad, TRUE, gst_pad_set_blocked (self->video_block_pad, TRUE,
_pad_blocked_cb, gst_object_ref (self), _pad_blocked_cb, gst_object_ref (self),
(GDestroyNotify) gst_object_unref); (GDestroyNotify) gst_object_unref);
GST_SUBTITLE_OVERLAY_UNLOCK (self); GST_SUBTITLE_OVERLAY_UNLOCK (self);
@ -1858,12 +1858,12 @@ gst_subtitle_overlay_subtitle_sink_unlink (GstPad * pad)
self->subtitle_error = FALSE; self->subtitle_error = FALSE;
if (self->subtitle_block_pad) if (self->subtitle_block_pad)
gst_pad_set_blocked_async_full (self->subtitle_block_pad, TRUE, gst_pad_set_blocked (self->subtitle_block_pad, TRUE,
_pad_blocked_cb, gst_object_ref (self), _pad_blocked_cb, gst_object_ref (self),
(GDestroyNotify) gst_object_unref); (GDestroyNotify) gst_object_unref);
if (self->video_block_pad) if (self->video_block_pad)
gst_pad_set_blocked_async_full (self->video_block_pad, TRUE, gst_pad_set_blocked (self->video_block_pad, TRUE,
_pad_blocked_cb, gst_object_ref (self), _pad_blocked_cb, gst_object_ref (self),
(GDestroyNotify) gst_object_unref); (GDestroyNotify) gst_object_unref);
GST_SUBTITLE_OVERLAY_UNLOCK (self); GST_SUBTITLE_OVERLAY_UNLOCK (self);
@ -1884,11 +1884,11 @@ gst_subtitle_overlay_subtitle_sink_event (GstPad * pad, GstEvent * event)
self->subtitle_flush = TRUE; self->subtitle_flush = TRUE;
self->subtitle_error = FALSE; self->subtitle_error = FALSE;
if (self->subtitle_block_pad) if (self->subtitle_block_pad)
gst_pad_set_blocked_async_full (self->subtitle_block_pad, TRUE, gst_pad_set_blocked (self->subtitle_block_pad, TRUE,
_pad_blocked_cb, gst_object_ref (self), _pad_blocked_cb, gst_object_ref (self),
(GDestroyNotify) gst_object_unref); (GDestroyNotify) gst_object_unref);
if (self->video_block_pad) if (self->video_block_pad)
gst_pad_set_blocked_async_full (self->video_block_pad, TRUE, gst_pad_set_blocked (self->video_block_pad, TRUE,
_pad_blocked_cb, gst_object_ref (self), _pad_blocked_cb, gst_object_ref (self),
(GDestroyNotify) gst_object_unref); (GDestroyNotify) gst_object_unref);
GST_SUBTITLE_OVERLAY_UNLOCK (self); GST_SUBTITLE_OVERLAY_UNLOCK (self);