mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 07:58:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

decodebin3: Convert checks to assertions

Browse source 
"decodebin.input" is never resetted and should always be present, therefore make
it an assertion check

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1900>
This commit is contained in:
Edward Hervey 2022-03-09 10:15:08 +01:00 committed by Edward Hervey
parent 9b94798d0b
commit c658e29d09
1 changed files with 6 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -844,23 +844,19 @@ gst_decodebin3_input_pad_link (GstPad * pad, GstObject * parent, GstPad * peer)
{ {
GstDecodebin3 *dbin = (GstDecodebin3 *) parent; GstDecodebin3 *dbin = (GstDecodebin3 *) parent;
GstPadLinkReturn res = GST_PAD_LINK_OK; GstPadLinkReturn res = GST_PAD_LINK_OK;
DecodebinInput *input; DecodebinInput *input = g_object_get_data (G_OBJECT (pad), "decodebin.input");
g_return_val_if_fail (input, GST_PAD_LINK_REFUSED);
GST_LOG_OBJECT (parent, "Got link on input pad %" GST_PTR_FORMAT GST_LOG_OBJECT (parent, "Got link on input pad %" GST_PTR_FORMAT
". Creating parsebin if needed", pad); ". Creating parsebin if needed", pad);
if ((input = g_object_get_data (G_OBJECT (pad), "decodebin.input")) == NULL)
goto fail;
INPUT_LOCK (dbin); INPUT_LOCK (dbin);
if (!ensure_input_parsebin (dbin, input)) if (!ensure_input_parsebin (dbin, input))
res = GST_PAD_LINK_REFUSED; res = GST_PAD_LINK_REFUSED;
INPUT_UNLOCK (dbin); INPUT_UNLOCK (dbin);
return res; return res;
fail:
GST_ERROR_OBJECT (parent, "Failed to retrieve input state from ghost pad");
return GST_PAD_LINK_REFUSED;
} }
/* Drop duration query during _input_pad_unlink */ /* Drop duration query during _input_pad_unlink */
@ -885,14 +881,13 @@ static void
gst_decodebin3_input_pad_unlink (GstPad * pad, GstObject * parent) gst_decodebin3_input_pad_unlink (GstPad * pad, GstObject * parent)
{ {
GstDecodebin3 *dbin = (GstDecodebin3 *) parent; GstDecodebin3 *dbin = (GstDecodebin3 *) parent;
DecodebinInput *input; DecodebinInput *input = g_object_get_data (G_OBJECT (pad), "decodebin.input");
g_return_if_fail (input);
GST_LOG_OBJECT (parent, "Got unlink on input pad %" GST_PTR_FORMAT GST_LOG_OBJECT (parent, "Got unlink on input pad %" GST_PTR_FORMAT
". Removing parsebin.", pad); ". Removing parsebin.", pad);
if ((input = g_object_get_data (G_OBJECT (pad), "decodebin.input")) == NULL)
goto fail;
INPUT_LOCK (dbin); INPUT_LOCK (dbin);
if (input->parsebin == NULL) { if (input->parsebin == NULL) {
INPUT_UNLOCK (dbin); INPUT_UNLOCK (dbin);
@ -952,10 +947,6 @@ gst_decodebin3_input_pad_unlink (GstPad * pad, GstObject * parent)
} }
INPUT_UNLOCK (dbin); INPUT_UNLOCK (dbin);
return; return;
fail:
GST_ERROR_OBJECT (parent, "Failed to retrieve input state from ghost pad");
return;
} }
static void static void