From 1960e1002fb4fa3c9afb3f0a46140beaa4947dcb Mon Sep 17 00:00:00 2001 From: Edward Hervey Date: Tue, 23 Feb 2016 09:36:50 +0100 Subject: Revert "playsink: Properly mark pending blocked pads" This reverts commit 3bc67006d4075f5bcbaa7de68230c8b0f551d44a. The issue that the patch fixes is only noticeable when using decodebin3, which isn't yet in master. --- gst/playback/gstplaysink.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gst/playback/gstplaysink.c b/gst/playback/gstplaysink.c index 765cf7ee5..c2308678c 100644 --- a/gst/playback/gstplaysink.c +++ b/gst/playback/gstplaysink.c @@ -4155,7 +4155,7 @@ video_set_blocked (GstPlaySink * playsink, gboolean blocked) gst_pad_remove_probe (((GstPlayVisChain *) playsink->vischain)-> blockpad, playsink->vis_pad_block_id); playsink->vis_pad_block_id = 0; - PENDING_FLAG_SET (playsink, GST_PLAY_SINK_TYPE_VIDEO); + playsink->video_block_id = gst_pad_add_probe (opad, GST_PAD_PROBE_TYPE_BLOCK_DOWNSTREAM, sinkpad_blocked_cb, playsink, NULL); @@ -4183,7 +4183,6 @@ audio_set_blocked (GstPlaySink * playsink, gboolean blocked) blockpad, playsink->vis_pad_block_id); playsink->vis_pad_block_id = 0; - PENDING_FLAG_SET (playsink, GST_PLAY_SINK_TYPE_AUDIO); playsink->audio_block_id = gst_pad_add_probe (opad, GST_PAD_PROBE_TYPE_BLOCK_DOWNSTREAM, sinkpad_blocked_cb, playsink, NULL); @@ -4216,7 +4215,6 @@ text_set_blocked (GstPlaySink * playsink, gboolean blocked) blockpad, playsink->vis_pad_block_id); playsink->vis_pad_block_id = 0; - PENDING_FLAG_SET (playsink, GST_PLAY_SINK_TYPE_TEXT); playsink->text_block_id = gst_pad_add_probe (opad, GST_PAD_PROBE_TYPE_BLOCK_DOWNSTREAM, sinkpad_blocked_cb, playsink, NULL); -- cgit v1.2.1