[FFmpeg-devel] [PATCH] avutil/hwcontext: Set proper CVBuffer colorspace

[Zhao Zhili]

> On May 20, 2024, at 09:12, Marvin Scholz <epirat07 at gmail.com> wrote:
> 
> Fix #10884

LGTM except the commit subject should mention videotoolbox or vt in short.

> ---
> libavutil/hwcontext_videotoolbox.c | 54 +++++++++++++++++++++---------
> 1 file changed, 38 insertions(+), 16 deletions(-)
> 
> diff --git a/libavutil/hwcontext_videotoolbox.c b/libavutil/hwcontext_videotoolbox.c
> index 9f82b104c3..4a35bfc7ff 100644
> --- a/libavutil/hwcontext_videotoolbox.c
> +++ b/libavutil/hwcontext_videotoolbox.c
> @@ -530,6 +530,8 @@ CFStringRef av_map_videotoolbox_color_trc_from_av(enum AVColorTransferCharacteri
> static int vt_pixbuf_set_colorspace(void *log_ctx,
>                                     CVPixelBufferRef pixbuf, const AVFrame *src)
> {
> +    CGColorSpaceRef colorspace = NULL;
> +    CFMutableDictionaryRef attachments = NULL;
>     CFStringRef colormatrix = NULL, colorpri = NULL, colortrc = NULL;
>     Float32 gamma = 0;
> 
> @@ -550,37 +552,57 @@ static int vt_pixbuf_set_colorspace(void *log_ctx,
>     else if (src->color_trc == AVCOL_TRC_GAMMA28)
>         gamma = 2.8;
> 
> +    attachments = CFDictionaryCreateMutable(NULL, 0,
> +                                                 &kCFTypeDictionaryKeyCallBacks,
> +                                                 &kCFTypeDictionaryValueCallBacks);
> +    if (!attachments)
> +        return AVERROR(ENOMEM);
> +
>     if (colormatrix) {
> -        CVBufferSetAttachment(
> -            pixbuf,
> +        CFDictionarySetValue(
> +            attachments,
>             kCVImageBufferYCbCrMatrixKey,
> -            colormatrix,
> -            kCVAttachmentMode_ShouldPropagate);
> +            colormatrix);
>     }
>     if (colorpri) {
> -        CVBufferSetAttachment(
> -            pixbuf,
> +        CFDictionarySetValue(
> +            attachments,
>             kCVImageBufferColorPrimariesKey,
> -            colorpri,
> -            kCVAttachmentMode_ShouldPropagate);
> +            colorpri);
>     }
>     if (colortrc) {
> -        CVBufferSetAttachment(
> -            pixbuf,
> +        CFDictionarySetValue(
> +            attachments,
>             kCVImageBufferTransferFunctionKey,
> -            colortrc,
> -            kCVAttachmentMode_ShouldPropagate);
> +            colortrc);
>     }
>     if (gamma != 0) {
>         CFNumberRef gamma_level = CFNumberCreate(NULL, kCFNumberFloat32Type, &gamma);
> -        CVBufferSetAttachment(
> -            pixbuf,
> +        CFDictionarySetValue(
> +            attachments,
>             kCVImageBufferGammaLevelKey,
> -            gamma_level,
> -            kCVAttachmentMode_ShouldPropagate);
> +            gamma_level);
>         CFRelease(gamma_level);
>     }
> 
> +    if (__builtin_available(macOS 10.8, iOS 10, *))
> +        colorspace = CVImageBufferCreateColorSpaceFromAttachments(attachments);
> +
> +    if (colorspace) {
> +        CFDictionarySetValue(
> +            attachments,
> +            kCVImageBufferCGColorSpaceKey,
> +            colorspace);
> +        CFRelease(colorspace);
> +    } else
> +        av_log(log_ctx, AV_LOG_WARNING, "Unable to set proper colorspace for the CVImageBuffer.\n");
> +
> +    CVBufferSetAttachments(
> +        pixbuf,
> +        attachments,
> +        kCVAttachmentMode_ShouldPropagate);
> +    CFRelease(attachments);
> +
>     return 0;
> }
> 
> 
> base-commit: 463c573e6b6489c588bee90124d5cf92db8ccaaa
> -- 
> 2.39.3 (Apple Git-145)
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel at ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
> 
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request at ffmpeg.org with subject "unsubscribe".