[FFmpeg-devel] [PATCH] lavfi/vf_libplacebo: add RGB colorspace sanity

[FFmpeg-devel] [PATCH] lavfi/vf_libplacebo: add RGB colorspace sanity

[Niklas Haas]

From: Niklas Haas <git@haasn.dev>

Explicitly forbid using a non-RGB colorspace with RGB pixel format or
vice versa. This mirrors identical logic from vf_scale.
---
 libavfilter/vf_libplacebo.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/libavfilter/vf_libplacebo.c b/libavfilter/vf_libplacebo.c
index f26d0126beb..e5af2693293 100644
--- a/libavfilter/vf_libplacebo.c
+++ b/libavfilter/vf_libplacebo.c
@@ -695,6 +695,13 @@ static int output_frame_mix(AVFilterContext *ctx,
     if (s->color_primaries >= 0)
         out->color_primaries = s->color_primaries;
 
+    /* Sanity colorspace overrides */
+    if (outdesc->flags & AV_PIX_FMT_FLAG_RGB) {
+        out->colorspace = AVCOL_SPC_RGB;
+    } else if (out->colorspace == AVCOL_SPC_RGB) {
+        out->colorspace = AVCOL_SPC_UNSPECIFIED;
+    }
+
     changed_csp = ref->colorspace      != out->colorspace     ||
                   ref->color_range     != out->color_range    ||
                   ref->color_trc       != out->color_trc      ||
-- 
2.40.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH] lavfi/vf_libplacebo: add RGB colorspace sanity

[Niklas Haas]

On Sun, 21 May 2023 15:54:20 +0200 Niklas Haas <ffmpeg@haasn.xyz> wrote:
> From: Niklas Haas <git@haasn.dev>
> 
> Explicitly forbid using a non-RGB colorspace with RGB pixel format or
> vice versa. This mirrors identical logic from vf_scale.
> ---
>  libavfilter/vf_libplacebo.c | 7 +++++++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/libavfilter/vf_libplacebo.c b/libavfilter/vf_libplacebo.c
> index f26d0126beb..e5af2693293 100644
> --- a/libavfilter/vf_libplacebo.c
> +++ b/libavfilter/vf_libplacebo.c
> @@ -695,6 +695,13 @@ static int output_frame_mix(AVFilterContext *ctx,
>      if (s->color_primaries >= 0)
>          out->color_primaries = s->color_primaries;
>  
> +    /* Sanity colorspace overrides */
> +    if (outdesc->flags & AV_PIX_FMT_FLAG_RGB) {
> +        out->colorspace = AVCOL_SPC_RGB;
> +    } else if (out->colorspace == AVCOL_SPC_RGB) {
> +        out->colorspace = AVCOL_SPC_UNSPECIFIED;
> +    }
> +
>      changed_csp = ref->colorspace      != out->colorspace     ||
>                    ref->color_range     != out->color_range    ||
>                    ref->color_trc       != out->color_trc      ||
> -- 
> 2.40.1
> 

Merged as f66280182acb03604df2ef58c623b4fa39c56444
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".