mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

playbin2: don't lose the ref to the volume element

Browse source 
Only release the ref to the volume element when it is controled by a sink. For
software volume we never have to fear that it will change.
This commit is contained in:
Wim Taymans 2009-05-28 17:21:35 +02:00
parent 7620d8800d
commit 3f20b0522a
1 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
gst/playback/gstplaysink.c
View file

@ -55,6 +55,7 @@ typedef struct
GstElement *conv; GstElement *conv;
GstElement *resample; GstElement *resample;
GstElement *volume; /* element with the volume property */ GstElement *volume; /* element with the volume property */
gboolean sink_volume; /* if the volume was provided by the sink */
GstElement *mute; /* element with the mute property */ GstElement *mute; /* element with the mute property */
GstElement *sink; GstElement *sink;
} GstPlayAudioChain; } GstPlayAudioChain;
@ -1371,6 +1372,7 @@ gen_audio_chain (GstPlaySink * playsink, gboolean raw, gboolean queue)
GST_DEBUG_OBJECT (playsink, "the sink has a volume property"); GST_DEBUG_OBJECT (playsink, "the sink has a volume property");
have_volume = TRUE; have_volume = TRUE;
chain->sink_volume = TRUE;
/* if the sink also has a mute property we can use this as well. We'll only /* if the sink also has a mute property we can use this as well. We'll only
* use the mute property if there is a volume property. We can simulate the * use the mute property if there is a volume property. We can simulate the
* mute with the volume otherwise. */ * mute with the volume otherwise. */
@ -1395,6 +1397,7 @@ gen_audio_chain (GstPlaySink * playsink, gboolean raw, gboolean queue)
/* no volume, we need to add a volume element when we can */ /* no volume, we need to add a volume element when we can */
GST_DEBUG_OBJECT (playsink, "the sink has no volume property"); GST_DEBUG_OBJECT (playsink, "the sink has no volume property");
have_volume = FALSE; have_volume = FALSE;
chain->sink_volume = FALSE;
} }
if (raw && !(playsink->flags & GST_PLAY_FLAG_NATIVE_AUDIO)) { if (raw && !(playsink->flags & GST_PLAY_FLAG_NATIVE_AUDIO)) {
@ -1792,8 +1795,8 @@ gst_play_sink_reconfigure (GstPlaySink * playsink)
playsink->audio_tee_vissrc = NULL; playsink->audio_tee_vissrc = NULL;
} }
srcpad = srcpad =
gst_element_get_static_pad (GST_ELEMENT_CAST (playsink-> gst_element_get_static_pad (GST_ELEMENT_CAST (playsink->vischain->
vischain->chain.bin), "src"); chain.bin), "src");
gst_pad_unlink (srcpad, playsink->videochain->sinkpad); gst_pad_unlink (srcpad, playsink->videochain->sinkpad);
} }
add_chain (GST_PLAY_CHAIN (playsink->videochain), FALSE); add_chain (GST_PLAY_CHAIN (playsink->videochain), FALSE);
@ -1945,8 +1948,10 @@ gst_play_sink_reconfigure (GstPlaySink * playsink)
gst_object_unref (playsink->audio_tee_asrc); gst_object_unref (playsink->audio_tee_asrc);
playsink->audio_tee_asrc = NULL; playsink->audio_tee_asrc = NULL;
} }
playsink->audiochain->volume = NULL; if (playsink->audiochain->sink_volume) {
playsink->audiochain->mute = NULL; playsink->audiochain->volume = NULL;
playsink->audiochain->mute = NULL;
}
add_chain (GST_PLAY_CHAIN (playsink->audiochain), FALSE); add_chain (GST_PLAY_CHAIN (playsink->audiochain), FALSE);
activate_chain (GST_PLAY_CHAIN (playsink->audiochain), FALSE); activate_chain (GST_PLAY_CHAIN (playsink->audiochain), FALSE);
} }
@ -1963,8 +1968,8 @@ gst_play_sink_reconfigure (GstPlaySink * playsink)
if (playsink->vischain) { if (playsink->vischain) {
GST_DEBUG_OBJECT (playsink, "setting up vis chain"); GST_DEBUG_OBJECT (playsink, "setting up vis chain");
srcpad = srcpad =
gst_element_get_static_pad (GST_ELEMENT_CAST (playsink-> gst_element_get_static_pad (GST_ELEMENT_CAST (playsink->vischain->
vischain->chain.bin), "src"); chain.bin), "src");
add_chain (GST_PLAY_CHAIN (playsink->vischain), TRUE); add_chain (GST_PLAY_CHAIN (playsink->vischain), TRUE);
activate_chain (GST_PLAY_CHAIN (playsink->vischain), TRUE); activate_chain (GST_PLAY_CHAIN (playsink->vischain), TRUE);
if (playsink->audio_tee_vissrc == NULL) { if (playsink->audio_tee_vissrc == NULL) {
@ -2349,8 +2354,9 @@ gst_play_sink_change_state (GstElement * element, GstStateChange transition)
break; break;
case GST_STATE_CHANGE_PAUSED_TO_READY: case GST_STATE_CHANGE_PAUSED_TO_READY:
case GST_STATE_CHANGE_READY_TO_NULL: case GST_STATE_CHANGE_READY_TO_NULL:
if (playsink->audiochain) { if (playsink->audiochain && playsink->audiochain->sink_volume) {
/* remove our links to the mute and volume elements */ /* remove our links to the mute and volume elements when they were
* provided by a sink */
playsink->audiochain->volume = NULL; playsink->audiochain->volume = NULL;
playsink->audiochain->mute = NULL; playsink->audiochain->mute = NULL;
} }