mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-26 19:51:11 +00:00
Code Issues 1 Projects Releases Wiki Activity

decodebin3: Only post collection message on actual updates

Browse source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6270>
This commit is contained in:
Edward Hervey 2024-03-01 17:38:46 +01:00 committed by GStreamer Marge Bot
parent 33fe063f50
commit 344acfe4e8
1 changed files with 24 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
subprojects/gst-plugins-base/gst/playback/gstdecodebin3.c
View file

@ -486,7 +486,7 @@ gst_decodebin3_select_stream (GstDecodebin3 * dbin,
static GstPad *gst_decodebin3_request_new_pad (GstElement * element, static GstPad *gst_decodebin3_request_new_pad (GstElement * element,
GstPadTemplate * temp, const gchar * name, const GstCaps * caps); GstPadTemplate * temp, const gchar * name, const GstCaps * caps);
static void gst_decodebin3_release_pad (GstElement * element, GstPad * pad); static void gst_decodebin3_release_pad (GstElement * element, GstPad * pad);
static void handle_stream_collection (GstDecodebin3 * dbin, static gboolean handle_stream_collection (GstDecodebin3 * dbin,
GstStreamCollection * collection, DecodebinInput * input); GstStreamCollection * collection, DecodebinInput * input);
static void gst_decodebin3_handle_message (GstBin * bin, GstMessage * message); static void gst_decodebin3_handle_message (GstBin * bin, GstMessage * message);
static GstStateChangeReturn gst_decodebin3_change_state (GstElement * element, static GstStateChangeReturn gst_decodebin3_change_state (GstElement * element,
@ -1416,22 +1416,25 @@ sink_event_function (GstPad * sinkpad, GstDecodebin3 * dbin, GstEvent * event)
gst_event_parse_stream_collection (event, &collection); gst_event_parse_stream_collection (event, &collection);
if (collection) { if (collection) {
gboolean post_collection;
INPUT_LOCK (dbin); INPUT_LOCK (dbin);
handle_stream_collection (dbin, collection, input); post_collection = handle_stream_collection (dbin, collection, input);
gst_object_unref (collection); gst_object_unref (collection);
INPUT_UNLOCK (dbin); INPUT_UNLOCK (dbin);
SELECTION_LOCK (dbin); SELECTION_LOCK (dbin);
/* Post the (potentially) updated collection */ /* Post the (potentially) updated collection */
if (dbin->collection) { if (post_collection) {
GstMessage *msg; GstMessage *msg;
msg = msg =
gst_message_new_stream_collection ((GstObject *) dbin, gst_message_new_stream_collection ((GstObject *) dbin,
dbin->collection); dbin->collection);
SELECTION_UNLOCK (dbin); SELECTION_UNLOCK (dbin);
gst_element_post_message (GST_ELEMENT_CAST (dbin), msg); gst_element_post_message (GST_ELEMENT_CAST (dbin), msg);
update_requested_selection (dbin);
} else } else
SELECTION_UNLOCK (dbin); SELECTION_UNLOCK (dbin);
/* In all cases we want to make sure the selection is valid */
update_requested_selection (dbin);
} }
/* If we are waiting to create an identity passthrough, do it now */ /* If we are waiting to create an identity passthrough, do it now */
@ -1950,11 +1953,14 @@ stream_in_collection (GstDecodebin3 * dbin, gchar * sid)
return NULL; return NULL;
} }
/* Call with INPUT_LOCK taken */ /* Call with INPUT_LOCK taken.
static void * Returns TRUE if the dbin collection changed
*/
static gboolean
handle_stream_collection (GstDecodebin3 * dbin, handle_stream_collection (GstDecodebin3 * dbin,
GstStreamCollection * collection, DecodebinInput * input) GstStreamCollection * collection, DecodebinInput * input)
{ {
gboolean ret = TRUE;
#ifndef GST_DISABLE_GST_DEBUG #ifndef GST_DISABLE_GST_DEBUG
const gchar *upstream_id; const gchar *upstream_id;
guint i; guint i;
@ -1962,7 +1968,7 @@ handle_stream_collection (GstDecodebin3 * dbin,
if (!input) { if (!input) {
GST_DEBUG_OBJECT (dbin, GST_DEBUG_OBJECT (dbin,
"Couldn't find corresponding input, most likely shutting down"); "Couldn't find corresponding input, most likely shutting down");
return; return FALSE;
} }
/* Replace collection in input */ /* Replace collection in input */
@ -2004,7 +2010,12 @@ handle_stream_collection (GstDecodebin3 * dbin,
/* Store collection for later usage */ /* Store collection for later usage */
SELECTION_LOCK (dbin); SELECTION_LOCK (dbin);
if (dbin->collection == NULL) { if (dbin->collection == NULL) {
GST_DEBUG_OBJECT (dbin, "Storing updated global collection");
dbin->collection = collection; dbin->collection = collection;
} else if (dbin->collection == collection) {
GST_DEBUG_OBJECT (dbin, "Collection didn't change");
gst_object_unref (collection);
ret = FALSE;
} else { } else {
/* We need to check who emitted this collection (the owner). /* We need to check who emitted this collection (the owner).
* If we already had a collection from that user, this one is an update, * If we already had a collection from that user, this one is an update,
@ -2016,8 +2027,11 @@ handle_stream_collection (GstDecodebin3 * dbin,
gst_object_unref (dbin->collection); gst_object_unref (dbin->collection);
dbin->collection = collection; dbin->collection = collection;
} }
dbin->select_streams_seqnum = GST_SEQNUM_INVALID; if (ret)
dbin->select_streams_seqnum = GST_SEQNUM_INVALID;
SELECTION_UNLOCK (dbin); SELECTION_UNLOCK (dbin);
return ret;
} }
/* Must be called with the selection lock taken */ /* Must be called with the selection lock taken */
@ -2111,13 +2125,12 @@ gst_decodebin3_handle_message (GstBin * bin, GstMessage * message)
} }
gst_message_parse_stream_collection (message, &collection); gst_message_parse_stream_collection (message, &collection);
if (collection) { if (collection) {
handle_stream_collection (dbin, collection, input); posting_collection = handle_stream_collection (dbin, collection, input);
posting_collection = TRUE;
} }
INPUT_UNLOCK (dbin); INPUT_UNLOCK (dbin);
SELECTION_LOCK (dbin); SELECTION_LOCK (dbin);
if (dbin->collection) { if (posting_collection) {
/* Replace collection message, we most likely aggregated it */ /* Replace collection message, we most likely aggregated it */
GstMessage *new_msg; GstMessage *new_msg;
new_msg = new_msg =