mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-16 19:25:18 +00:00
Code Issues 1 Projects Releases Wiki Activity

encodebin: Fix pad removal for encodebin vs encodebin2

Browse source 
Clarify the fact that `encodebasebin->src_pad` is set when using a static source
pad (`encodebin`) and when not set it's dynamically added source
pads (`encodebin2`).

Fixes usage of encodebin2 when profiles are updated

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/7523>
This commit is contained in:
Edward Hervey 2024-04-17 09:46:35 +02:00 committed by Backport Bot
parent 924a279f33
commit ca33e15de9
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
subprojects/gst-plugins-base/gst/encoding/gstencodebasebin.c
View file

@ -1562,6 +1562,7 @@ _create_stream_group (GstEncodeBaseBin * ebin, GstEncodingProfile * sprof,
gst_object_unref (muxerpad); gst_object_unref (muxerpad);
} else { } else {
if (ebin->srcpad) { if (ebin->srcpad) {
/* encodebin static source pad */
gst_ghost_pad_set_target (GST_GHOST_PAD (ebin->srcpad), srcpad); gst_ghost_pad_set_target (GST_GHOST_PAD (ebin->srcpad), srcpad);
} else { } else {
if (!gst_encode_base_bin_create_src_pad (ebin, srcpad)) { if (!gst_encode_base_bin_create_src_pad (ebin, srcpad)) {
@ -2272,6 +2273,7 @@ create_elements_and_pads (GstEncodeBaseBin * ebin)
* but for the time being let's assume it's a static pad :) */ * but for the time being let's assume it's a static pad :) */
muxerpad = gst_element_get_static_pad (muxer, "src"); muxerpad = gst_element_get_static_pad (muxer, "src");
if (ebin->srcpad) { if (ebin->srcpad) {
/* encodebin static source pad */
if (G_UNLIKELY (muxerpad == NULL)) if (G_UNLIKELY (muxerpad == NULL))
goto no_muxer_pad; goto no_muxer_pad;
if (!gst_ghost_pad_set_target (GST_GHOST_PAD (ebin->srcpad), muxerpad)) if (!gst_ghost_pad_set_target (GST_GHOST_PAD (ebin->srcpad), muxerpad))
@ -2551,7 +2553,7 @@ gst_encode_base_bin_tear_down_profile (GstEncodeBaseBin * ebin)
stream_group_remove (ebin, (StreamGroup *) ebin->streams->data); stream_group_remove (ebin, (StreamGroup *) ebin->streams->data);
if (ebin->srcpad) { if (ebin->srcpad) {
/* Set ghostpad target to NULL */ /* encodebin static source pad, set ghostpad target to NULL */
gst_ghost_pad_set_target (GST_GHOST_PAD (ebin->srcpad), NULL); gst_ghost_pad_set_target (GST_GHOST_PAD (ebin->srcpad), NULL);
} }
@ -2564,7 +2566,8 @@ gst_encode_base_bin_tear_down_profile (GstEncodeBaseBin * ebin)
ebin->muxer = NULL; ebin->muxer = NULL;
} }
if (!element->srcpads) { if (!ebin->srcpad) {
/* encodebin2 dynamic source pads */
while (element->srcpads) while (element->srcpads)
gst_element_remove_pad (element, element->srcpads->data); gst_element_remove_pad (element, element->srcpads->data);
} }