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 9647B4AA3F for ; Sun, 7 Jul 2024 10:42:57 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0CE3F68D964; Sun, 7 Jul 2024 13:42:54 +0300 (EEST) Received: from out203-205-221-164.mail.qq.com (out203-205-221-164.mail.qq.com [203.205.221.164]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C9FD568D964 for ; Sun, 7 Jul 2024 13:42:46 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1720348958; bh=oY4V/hXhLubthBPUXV0oTergzI6c15LIKdbRvJXDlM8=; h=Subject:From:In-Reply-To:Date:Cc:References:To; b=Fbv+r7D9tyPxu/RlbTELcscHgMQ0yiTb/9E5WHPcgwQnrG72KR+9jMtGdBMTzanJD ml+bPmskUgc/75e+3LFDeoSLcNuYFmCr39U5sWmbS3HtLXDDzKpdFwt6M/FT9dt8uD g7Z2AEDoWn42U8VqScy0oDUJnpkIWXPT5sOG0Tvo= Received: from smtpclient.apple ([113.116.28.29]) by newxmesmtplogicsvrszc5-2.qq.com (NewEsmtp) with SMTP id AA53166A; Sun, 07 Jul 2024 18:42:37 +0800 X-QQ-mid: xmsmtpt1720348957t5yoh1ma5 Message-ID: X-QQ-XMAILINFO: MyirvGjpKb1jgahr6WKMUac4NxfE1+ku7PFN+GVLuio5sp+6YEMFRQRgzDaAW7 K+C2REr/W6CdoLDSeFN6ezD8pxsE+HeNXCv05kYplUeLp77C35D/O47NVqUlE0tH8rmnEtgIime/ y3IlBMFZFi2oQjeHXi2UdpMAIJmaNAsWD8+M1FsZAZm3gPiKhuySRaIkc8e1WjS3bWsnknZMe6jf Z52d0o7jtU5iTu7QBaY5/rkKCI50yvwCxUwZDEkSvP5UhaDNDsfJdQ/6pTYVrWLvRL4GAEeEuPf/ ugGKfTdbirbjjlmL36mz/iHp8Jh3pZpQaLeYw+Bwr27ELpwyrz0hCqDsBmf5yizQmzAUsoeVg48e CZ28Y6C/UeHLoQ3hwAoNYHzyjZovbkjq3RHwu171cDVYxewPfzNlx/kuNctsUU2IVXYPv+w+WRCa NCOWDEQVv5zBbf2JkIu5YtwuyRuYWDAPCWtmfTKdikAbAEmzvVqf8lbowAyQP9TtmFllaWrNNJla FhJecNvRe2NyW8Ea3yZXoiol/PiyBI5Jm+RLn7bCAyO4a4ELKJg7L/oOIi/u3H4c76HaGEmjHthe z0OECt2q18VnN8sWClOzSlP1W4e8L0d/lFfVGBT3cXs7z0aZJAfSeO8Ncs2rTYJLvG9AWwWHph0Z cCRXD1KC9jzVk9amNQYuyTg4z3nte1SaoKtSyVi7N5jxgOOK4NwIO0dEWA5h0wFDzwM0WdPKmIl6 xJ3gCeBf/lK87wTAqQW63e2tDWYJDXIlcf5s1lpBtNwq5MYGcgA/5gGlbqpvbP+N0g+EYqQqnYpN JqmMDnLLRLS7mQAIUZegJvSUbOnp0MrwpPD7/FimkpJx3P2/tL6jl21ookwm517hS5Cps2e2wwP1 POIfLNogzqbK31WBdo3L51Gb3lsuEjiSCUWLFAa9xvnImGGZoHEu9wdBYGK1mgrV1ckDWG7N7oZa jMWmEM8b+CiesKCLRyBgGJwvVSiZPDtPH+DIYxpNMMMhyaEGUO0gEQ2gqPu40I X-QQ-XMRINFO: M/715EihBoGSf6IYSX1iLFg= Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3774.500.171.1.1\)) From: Zhao Zhili In-Reply-To: <20240621060820.3215-1-hguandl@gmail.com> Date: Sun, 7 Jul 2024 18:42:27 +0800 X-OQ-MSGID: <308DD6DE-6DAE-400F-8FD7-A71BD647C302@foxmail.com> References: <20240621060820.3215-1-hguandl@gmail.com> To: FFmpeg development discussions and patches X-Mailer: Apple Mail (2.3774.500.171.1.1) Subject: Re: [FFmpeg-devel] [PATCH] avcodec/videotoolboxenc: fix vtctx reset condition 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 Cc: Hao Guan 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 Jun 21, 2024, at 14:08, Hao Guan wrote: > > In vtenc_populate_extradata, the cleanup function vtenc_reset should not > be used when no error occurs, otherwise some color information is lost > (#11036). > > This patch checks the status code and conducts the correct cleanup. LGTM, thanks! > > Signed-off-by: Hao Guan > --- > libavcodec/videotoolboxenc.c | 9 ++++++++- > 1 file changed, 8 insertions(+), 1 deletion(-) > > diff --git a/libavcodec/videotoolboxenc.c b/libavcodec/videotoolboxenc.c > index 15c34d59c3..0aa4885232 100644 > --- a/libavcodec/videotoolboxenc.c > +++ b/libavcodec/videotoolboxenc.c > @@ -2766,7 +2766,14 @@ static int vtenc_populate_extradata(AVCodecContext *avctx, > > pe_cleanup: > CVPixelBufferRelease(pix_buf); > - vtenc_reset(vtctx); > + > + if (status) { > + vtenc_reset(vtctx); > + } else if (vtctx->session) { > + CFRelease(vtctx->session); > + vtctx->session = NULL; > + } > + > vtctx->frame_ct_out = 0; > > av_assert0(status != 0 || (avctx->extradata && avctx->extradata_size > 0)); > -- > 2.39.3 (Apple Git-146) > > _______________________________________________ > 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".