mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-05 15:08:53 +00:00
Code Issues 1 Projects Releases Wiki Activity

playbin3: Reconfigure playsink again with pad-removed

Browse source 
If selected streams and actived streams are matched,
do reconfigure of playsink again with pad-removed signal

https://bugzilla.gnome.org/show_bug.cgi?id=773341
This commit is contained in:
Seungha Yang 2016-12-03 20:44:21 +09:00 committed by Edward Hervey
parent 858ee3d913
commit f4d6aa7167
1 changed files with 22 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
gst/playback/gstplaybin3.c
View file

@ -2970,6 +2970,8 @@ pad_removed_cb (GstElement * decodebin, GstPad * pad, GstPlayBin3 * playbin)
GstElement *combiner; GstElement *combiner;
GstSourceCombine *combine; GstSourceCombine *combine;
gulong event_probe_handler; gulong event_probe_handler;
GstStreamType stream_type = GST_STREAM_TYPE_UNKNOWN;
gchar *pad_name;
GST_DEBUG_OBJECT (playbin, GST_DEBUG_OBJECT (playbin,
"decoded pad %s:%s removed", GST_DEBUG_PAD_NAME (pad)); "decoded pad %s:%s removed", GST_DEBUG_PAD_NAME (pad));
@ -2983,10 +2985,23 @@ pad_removed_cb (GstElement * decodebin, GstPad * pad, GstPlayBin3 * playbin)
g_object_set_data (G_OBJECT (pad), "playbin.event_probe_id", NULL); g_object_set_data (G_OBJECT (pad), "playbin.event_probe_id", NULL);
} }
pad_name = gst_object_get_name (GST_OBJECT (pad));
if (g_str_has_prefix (pad_name, "video")) {
stream_type = GST_STREAM_TYPE_VIDEO;
} else if (g_str_has_prefix (pad_name, "audio")) {
stream_type = GST_STREAM_TYPE_AUDIO;
} else if (g_str_has_prefix (pad_name, "text")) {
stream_type = GST_STREAM_TYPE_TEXT;
}
g_free (pad_name);
if ((combine = g_object_get_data (G_OBJECT (pad), "playbin.combine"))) { if ((combine = g_object_get_data (G_OBJECT (pad), "playbin.combine"))) {
g_assert (combine->combiner == NULL); g_assert (combine->combiner == NULL);
g_assert (combine->srcpad == pad); g_assert (combine->srcpad == pad);
source_combine_remove_pads (playbin, combine); source_combine_remove_pads (playbin, combine);
playbin->active_stream_types &= ~stream_type;
goto exit; goto exit;
} }
@ -3013,6 +3028,7 @@ pad_removed_cb (GstElement * decodebin, GstPad * pad, GstPlayBin3 * playbin)
gst_element_set_state (combine->combiner, GST_STATE_NULL); gst_element_set_state (combine->combiner, GST_STATE_NULL);
gst_bin_remove (GST_BIN_CAST (playbin), combine->combiner); gst_bin_remove (GST_BIN_CAST (playbin), combine->combiner);
combine->combiner = NULL; combine->combiner = NULL;
playbin->active_stream_types &= ~stream_type;
} }
} }
@ -3025,6 +3041,12 @@ pad_removed_cb (GstElement * decodebin, GstPad * pad, GstPlayBin3 * playbin)
exit: exit:
GST_PLAY_BIN3_UNLOCK (playbin); GST_PLAY_BIN3_UNLOCK (playbin);
if ((playbin->selected_stream_types & ~playbin->active_stream_types &
(GST_STREAM_TYPE_VIDEO | GST_STREAM_TYPE_AUDIO))
== 0) {
no_more_pads_cb (decodebin, playbin);
}
return; return;
/* ERRORS */ /* ERRORS */