From 56ec817bf466fc7bc9cdf0918ab48d3e23d5d47c Mon Sep 17 00:00:00 2001 From: Mathieu Duponchelle Date: Mon, 11 Jul 2022 20:12:30 +0200 Subject: [PATCH] videoaggregator: always convert when user provides converter-config The `converter-config` property may be used to perform cropping, conversion should always be performed when the user set the property to a non-NULL value. Part-of: --- .../gst-libs/gst/video/gstvideoaggregator.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/subprojects/gst-plugins-base/gst-libs/gst/video/gstvideoaggregator.c b/subprojects/gst-plugins-base/gst-libs/gst/video/gstvideoaggregator.c index 56396d933c..f414b9cacb 100644 --- a/subprojects/gst-plugins-base/gst-libs/gst/video/gstvideoaggregator.c +++ b/subprojects/gst-plugins-base/gst-libs/gst/video/gstvideoaggregator.c @@ -502,7 +502,8 @@ gst_video_aggregator_convert_pad_prepare_frame (GstVideoAggregatorPad * vpad, gst_video_converter_free (pad->priv->convert); pad->priv->convert = NULL; - if (!gst_video_info_is_equal (&vpad->info, &pad->priv->conversion_info)) { + if (!gst_video_info_is_equal (&vpad->info, &pad->priv->conversion_info) + || pad->priv->converter_config) { pad->priv->convert = gst_video_converter_new_with_pool (&vpad->info, &pad->priv->conversion_info, @@ -792,7 +793,8 @@ static void gst_video_converter_free (pad->priv->convert); pad->priv->convert = NULL; - if (!gst_video_info_is_equal (&vpad->info, &pad->priv->conversion_info)) { + if (!gst_video_info_is_equal (&vpad->info, &pad->priv->conversion_info) + || pad->priv->converter_config) { GstStructure *conv_config; if (pad->priv->converter_config) {