mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-18 22:36:33 +00:00
Code Issues 1 Projects Releases Wiki Activity

videoaggregator: always convert when user provides converter-config

Browse source 
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>
This commit is contained in:
Mathieu Duponchelle 2022-07-11 20:12:30 +02:00 committed by GStreamer Marge Bot
parent eb0746ba97
commit 56ec817bf4
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
subprojects/gst-plugins-base/gst-libs/gst/video/gstvideoaggregator.c
View file

@ -502,7 +502,8 @@ gst_video_aggregator_convert_pad_prepare_frame (GstVideoAggregatorPad * vpad,
gst_video_converter_free (pad->priv->convert); gst_video_converter_free (pad->priv->convert);
pad->priv->convert = NULL; 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 = pad->priv->convert =
gst_video_converter_new_with_pool (&vpad->info, gst_video_converter_new_with_pool (&vpad->info,
&pad->priv->conversion_info, &pad->priv->conversion_info,
@ -792,7 +793,8 @@ static void
gst_video_converter_free (pad->priv->convert); gst_video_converter_free (pad->priv->convert);
pad->priv->convert = NULL; 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; GstStructure *conv_config;
if (pad->priv->converter_config) { if (pad->priv->converter_config) {