From d9ebd9203c2b087041e158cc8af2e1dc6f123d04 Mon Sep 17 00:00:00 2001 From: Nicolas Dufresne Date: Thu, 19 May 2022 15:51:03 -0400 Subject: [PATCH] v4l2videodec: Fix activation of internal pool If the driver does not support VIDIOC_CREATE_BUFS ioctl, the pool configuration may get changed, which requires a validation. This would fail to activate a pool in a case it shouldn't normally fail unless we are out of memory. Part-of: --- .../gst-plugins-good/sys/v4l2/gstv4l2videodec.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2videodec.c b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2videodec.c index 7cd8443047..3042995ea8 100644 --- a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2videodec.c +++ b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2videodec.c @@ -719,8 +719,19 @@ gst_v4l2_video_dec_handle_frame (GstVideoDecoder * decoder, self->v4l2output->info.size, min, max); /* There is no reason to refuse this config */ - if (!gst_buffer_pool_set_config (pool, config)) - goto activate_failed; + if (!gst_buffer_pool_set_config (pool, config)) { + config = gst_buffer_pool_get_config (pool); + + if (!gst_buffer_pool_config_validate_params (config, + self->input_state->caps, self->v4l2output->info.size, min, + max)) { + gst_structure_free (config); + goto activate_failed; + } + + if (!gst_buffer_pool_set_config (pool, config)) + goto activate_failed; + } if (!gst_buffer_pool_set_active (pool, TRUE)) goto activate_failed;