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

playsink: fix vis switch with format change

Browse source 
Block the pad before the resample and convertor elements to give the a chance to
negotiate new caps with the newly switched vis plugin.

Fixes https://bugzilla.gnome.org/show_bug.cgi?id=679976
This commit is contained in:
Wim Taymans 2012-12-13 11:31:28 +01:00
parent 63ec68bc47
commit 66cafcc34d
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gst/playback/gstplaysink.c
View file

@ -133,7 +133,8 @@ typedef struct
GstElement *queue; GstElement *queue;
GstElement *conv; GstElement *conv;
GstElement *resample; GstElement *resample;
GstPad *blockpad; /* srcpad of resample, used for switching the vis */ GstPad *blockpad; /* srcpad of queue, used for blocking the vis */
GstPad *vispeerpad; /* srcpad of resample, used for unlinking the vis */
GstPad *vissinkpad; /* visualisation sinkpad, */ GstPad *vissinkpad; /* visualisation sinkpad, */
GstElement *vis; GstElement *vis;
GstPad *vissrcpad; /* visualisation srcpad, */ GstPad *vissrcpad; /* visualisation srcpad, */
@ -911,7 +912,7 @@ gst_play_sink_vis_blocked (GstPad * tee_pad, GstPadProbeInfo * info,
goto done; goto done;
/* unlink the old plugin and unghost the pad */ /* unlink the old plugin and unghost the pad */
gst_pad_unlink (chain->blockpad, chain->vissinkpad); gst_pad_unlink (chain->vispeerpad, chain->vissinkpad);
gst_ghost_pad_set_target (GST_GHOST_PAD_CAST (chain->srcpad), NULL); gst_ghost_pad_set_target (GST_GHOST_PAD_CAST (chain->srcpad), NULL);
/* set the old plugin to NULL and remove */ /* set the old plugin to NULL and remove */
@ -928,7 +929,7 @@ gst_play_sink_vis_blocked (GstPad * tee_pad, GstPadProbeInfo * info,
chain->vissrcpad = gst_element_get_static_pad (chain->vis, "src"); chain->vissrcpad = gst_element_get_static_pad (chain->vis, "src");
/* link pads */ /* link pads */
gst_pad_link_full (chain->blockpad, chain->vissinkpad, gst_pad_link_full (chain->vispeerpad, chain->vissinkpad,
GST_PAD_LINK_CHECK_NOTHING); GST_PAD_LINK_CHECK_NOTHING);
gst_ghost_pad_set_target (GST_GHOST_PAD_CAST (chain->srcpad), gst_ghost_pad_set_target (GST_GHOST_PAD_CAST (chain->srcpad),
chain->vissrcpad); chain->vissrcpad);
@ -2846,8 +2847,12 @@ gen_vis_chain (GstPlaySink * playsink)
gst_bin_add (bin, chain->resample); gst_bin_add (bin, chain->resample);
/* this pad will be used for blocking the dataflow and switching the vis /* this pad will be used for blocking the dataflow and switching the vis
* plugin, we block right after the queue, this makes it possible for the
* resample and convert to convert to a format supported by the new vis
* plugin */ * plugin */
chain->blockpad = gst_element_get_static_pad (chain->resample, "src"); chain->blockpad = gst_element_get_static_pad (chain->queue, "src");
/* this is the pad where the vis is linked to */
chain->vispeerpad = gst_element_get_static_pad (chain->resample, "src");
if (playsink->visualisation) { if (playsink->visualisation) {
GST_DEBUG_OBJECT (playsink, "trying configure vis"); GST_DEBUG_OBJECT (playsink, "trying configure vis");