From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 474184AD2D for ; Mon, 20 May 2024 15:37:09 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EA3BE68CF9D; Mon, 20 May 2024 18:37:06 +0300 (EEST) Received: from out203-205-221-205.mail.qq.com (out203-205-221-205.mail.qq.com [203.205.221.205]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F034568C442 for ; Mon, 20 May 2024 18:36:58 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1716219412; bh=WwlRmAPa4qtRTpZSSvbwlx78DBqVUCrNPfhY6kH1LaM=; h=From:Subject:Date:References:To:In-Reply-To; b=PcpVpRvrBJNq5LedvPB2HSLoSC3bLPEW3wNEl8yehWfdSy7pxQCKklHFOYGk1+B5j PiwOa/NUyPOZYEjoCrzwe1Di1toaGn+qhOH+gCydsrudTV8g1SM13FYspJWWgx1Wxx YV/ovD9lrPbWcV9Gq7++jcV6L+dLQ/GBoni3qBzs= Received: from smtpclient.apple ([113.118.103.69]) by newxmesmtplogicsvrszb16-1.qq.com (NewEsmtp) with SMTP id 933A2EE2; Mon, 20 May 2024 23:36:51 +0800 X-QQ-mid: xmsmtpt1716219411ti0assnd6 Message-ID: X-QQ-XMAILINFO: OAMwf2xuDd/jST+NKuHG8vMlBASKCmSAGKxp3g14YSQQolmCotmVM+v9mg5UsE XMm8Dssvh2TWBpu0DwnWKm0C+KBVBkFXinbi87RKzAUG4dAOpcc4jVAD5N4Ahli2N8wRsTnQ+GGD xpY5guCWKo7nDC04g8jGGurQNSoSKfCME+WdJNusr4nIap2suDnjdR4XwaXmdZ+Rri7Q7qeJOMCu oO625hdmjUoO28E6CybNzymxCjnuDjp4t8WlZuI/+cp8IBC7bcQiO4YYdwNrG8Hqe4vd7Em1eL/e PBV0pePXNK+TwhEq6A6LTmZH0U3Ky5b34LMHe5kg68t9DxaegTLqxIJC70hQrpVDBy461jiRT7eZ XJZPFU1SeaNoyNzYxNVuob3Jwg0Ud8hpa4y2rWM+IM3KJFUqJLNOO55fTst6RsYF1ksbI3JQN8YO fRqbfgMCLU94Mqvwej1wybLhBvxwfhpC02ZlgoJnd9xMQE7zr9lh/urKGV+b5IuC8EpuXvXFbGn3 96vPYPfeR2jI8/0aceXnjsJh/TfZWCJz0KRvivQshHOfWfUkU8Yn/HDIWkdwCdFwkZdeN52YZuIf c5lRXrgyA3SxqM7maLSQnm9cwm4eP4wtYXOdff6Zh5+hAMHRFgxkICjgEpYxXJclB8Z1ZrrYTm47 6c8uJMaky7zZ5k/3Uwyrtm/GzzL9qkhWcb0PWUtfoTrH2fnSs7h4CYBgvatlt4H/UzUQ2U5jCnKu 1X8g25UC9/XTcoFr4nbPxXzyBbotrtegzG0DYSdyaVH0Qf4D09jIqYA1lN1TP5jmoeVNK323zQ4Y ZVuUY095g90/X6dMeh7rHPCS9uK2GrBMGp4pJShjrtN2ZBboB8mFwVRkl23rdFIvH6MXcszOOYjK vCFLKdgB6/s6AJmXyCjw5+TeAGajn5+jvBmW2iJmJgHYtdaacPrzJT/A7+Jfl1eM54S426NYnJqc zY/5sS/ZAplgGIKWc3ckDalglcyI4HB4bZQH91Kote7dR3rfAtAA== X-QQ-XMRINFO: NS+P29fieYNw95Bth2bWPxk= From: Zhao Zhili Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3774.500.171.1.1\)) Date: Mon, 20 May 2024 23:36:41 +0800 References: To: FFmpeg development discussions and patches In-Reply-To: X-OQ-MSGID: <6C6E6EC3-FA6B-4609-BBDD-CCCCF09D9BCE@foxmail.com> X-Mailer: Apple Mail (2.3774.500.171.1.1) Subject: Re: [FFmpeg-devel] [PATCH] avutil/hwcontext: Set proper CVBuffer colorspace X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: > On May 20, 2024, at 09:12, Marvin Scholz 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@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". _______________________________________________ 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".