From 77c327f356af9a82e9a4e199bf059311e2ad738e Mon Sep 17 00:00:00 2001 From: "Jan Alexander Steffens (heftig)" Date: Tue, 13 Oct 2020 15:28:54 +0200 Subject: [PATCH 1/2] videoaggregator: Log the format name instead of index Part-of: --- gst-libs/gst/video/gstvideoaggregator.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gst-libs/gst/video/gstvideoaggregator.c b/gst-libs/gst/video/gstvideoaggregator.c index 0addc39ef..c2146ce36 100644 --- a/gst-libs/gst/video/gstvideoaggregator.c +++ b/gst-libs/gst/video/gstvideoaggregator.c @@ -476,9 +476,10 @@ gst_video_aggregator_convert_pad_prepare_frame (GstVideoAggregatorPad * vpad, return FALSE; } - GST_DEBUG_OBJECT (pad, "This pad will be converted from %d to %d", - GST_VIDEO_INFO_FORMAT (&vpad->info), - GST_VIDEO_INFO_FORMAT (&pad->priv->conversion_info)); + GST_DEBUG_OBJECT (pad, "This pad will be converted from %s to %s", + gst_video_format_to_string (GST_VIDEO_INFO_FORMAT (&vpad->info)), + gst_video_format_to_string (GST_VIDEO_INFO_FORMAT (&pad-> + priv->conversion_info))); } else { GST_DEBUG_OBJECT (pad, "This pad will not need conversion"); } @@ -955,8 +956,8 @@ gst_video_aggregator_default_update_caps (GstVideoAggregator * vagg, color_name = gst_video_colorimetry_to_string (&best_info.colorimetry); GST_DEBUG_OBJECT (vagg, - "The output format will now be : %d with chroma : %s and colorimetry %s", - best_format, + "The output format will now be : %s with chroma : %s and colorimetry %s", + gst_video_format_to_string (best_format), GST_STR_NULL (gst_video_chroma_to_string (best_info.chroma_site)), GST_STR_NULL (color_name)); -- GitLab From 23189c60f4cff998c7880e1768cee2f6d1b719d0 Mon Sep 17 00:00:00 2001 From: "Jan Alexander Steffens (heftig)" Date: Tue, 13 Oct 2020 15:31:41 +0200 Subject: [PATCH 2/2] videoaggregator: Limit accepted caps by template caps This seems like an obvious mistake, since `modified_caps` was created but not used. Part-of: --- gst-libs/gst/video/gstvideoaggregator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gst-libs/gst/video/gstvideoaggregator.c b/gst-libs/gst/video/gstvideoaggregator.c index c2146ce36..2ce791f77 100644 --- a/gst-libs/gst/video/gstvideoaggregator.c +++ b/gst-libs/gst/video/gstvideoaggregator.c @@ -2519,7 +2519,7 @@ gst_video_aggregator_pad_sink_acceptcaps (GstPad * pad, modified_caps = gst_caps_intersect (accepted_caps, template_caps); - ret = gst_caps_can_intersect (caps, accepted_caps); + ret = gst_caps_can_intersect (caps, modified_caps); GST_DEBUG_OBJECT (pad, "%saccepted caps %" GST_PTR_FORMAT, (ret ? "" : "not "), caps); gst_caps_unref (accepted_caps); -- GitLab