mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-24 09:10:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

decodebin3: Update stream-collection with _input_pad_unlink()

Browse source 
Since parsebin does not post new stream-collection message when
it was being removed, decodebin3 should update it itself.

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

32
gst/playback/gstdecodebin3.c
View file

@ -506,6 +506,10 @@ static void free_multiqueue_slot (GstDecodebin3 * dbin, MultiQueueSlot * slot);
static void free_multiqueue_slot_async (GstDecodebin3 * dbin, static void free_multiqueue_slot_async (GstDecodebin3 * dbin,
MultiQueueSlot * slot); MultiQueueSlot * slot);
static GstStreamCollection *get_merged_collection (GstDecodebin3 * dbin);
static void update_requested_selection (GstDecodebin3 * dbin,
GstStreamCollection * collection);
/* FIXME: Really make all the parser stuff a self-contained helper object */ /* FIXME: Really make all the parser stuff a self-contained helper object */
#include "gstdecodebin3-parse.c" #include "gstdecodebin3-parse.c"
@ -811,6 +815,32 @@ gst_decodebin3_input_pad_unlink (GstPad * pad, GstObject * parent)
} }
if (GST_OBJECT_PARENT (GST_OBJECT (input->parsebin)) == GST_OBJECT (dbin)) { if (GST_OBJECT_PARENT (GST_OBJECT (input->parsebin)) == GST_OBJECT (dbin)) {
GstStreamCollection *collection = NULL;
/* Clear stream-collection corresponding to current INPUT and post new
* stream-collection message, if needed */
if (input->collection) {
gst_object_unref (input->collection);
input->collection = NULL;
}
collection = get_merged_collection (dbin);
if (collection && collection != dbin->collection) {
GstMessage *msg;
GST_DEBUG_OBJECT (dbin, "Update Stream Collection");
if (dbin->collection)
gst_object_unref (dbin->collection);
dbin->collection = collection;
msg =
gst_message_new_stream_collection ((GstObject *) dbin,
dbin->collection);
gst_element_post_message (GST_ELEMENT_CAST (dbin), msg);
update_requested_selection (dbin, dbin->collection);
}
gst_bin_remove (GST_BIN (dbin), input->parsebin); gst_bin_remove (GST_BIN (dbin), input->parsebin);
gst_element_set_state (input->parsebin, GST_STATE_NULL); gst_element_set_state (input->parsebin, GST_STATE_NULL);
g_signal_handler_disconnect (input->parsebin, input->pad_removed_sigid); g_signal_handler_disconnect (input->parsebin, input->pad_removed_sigid);
@ -1071,7 +1101,7 @@ get_merged_collection (GstDecodebin3 * dbin)
if (!needs_merge) { if (!needs_merge) {
GST_DEBUG_OBJECT (dbin, "No need to merge, returning %p", res); GST_DEBUG_OBJECT (dbin, "No need to merge, returning %p", res);
return gst_object_ref (res); return res ? gst_object_ref (res) : NULL;
} }
/* We really need to create a new collection */ /* We really need to create a new collection */