videoaggregator: always convert when user provides converter-config
authorMathieu Duponchelle <mathieu@centricular.com>
Mon, 11 Jul 2022 18:12:30 +0000 (20:12 +0200)
committerGStreamer Marge Bot <gitlab-merge-bot@gstreamer-foundation.org>
Tue, 12 Jul 2022 08:03:08 +0000 (08:03 +0000)
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: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2746>

subprojects/gst-plugins-base/gst-libs/gst/video/gstvideoaggregator.c

index 56396d9..f414b9c 100644 (file)
@@ -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) {