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 AF9EA40186 for ; Wed, 4 Jan 2023 02:38:03 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B359368BDE2; Wed, 4 Jan 2023 04:38:02 +0200 (EET) 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 B42B968BDDF for ; Wed, 4 Jan 2023 04:37:55 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1672799872; bh=GNol4G0VLxjeRQv6C+a4yQAUFOJ2naj2WV1WGSzXAJk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=KJ7mzr2I/YbyBvad5ExsQicpFbu0FzmimStnE0z+WntXp6XeoZmHYla982zxjQ18O YxsQjhK2Dq38gO3/NKjCpqTQu+ja7ZgYQMM56mVxxVTR7l5RCaR8BtnJjKLCAQOMFh irPu9Sot2Fd0I7dGaUeWtObJwTdqjiFhJ6zIhSOc= Received: from ZHILIZHAO-MB2.tencent.com ([119.147.10.191]) by newxmesmtplogicsvrszc2-0.qq.com (NewEsmtp) with SMTP id 973802A2; Wed, 04 Jan 2023 10:37:51 +0800 X-QQ-mid: xmsmtpt1672799871twxq5a3co Message-ID: X-QQ-XMAILINFO: MmpliBmRb3iCsYE0oNivd0tm8zlw70w5AnadUeeY7/i6vyLv3QZe7zuQFN+u3A 7yvC3YenINRvam67QMWddG2OXiJYCu8vXUjsqZshWfmeIq1LEmEXhYfXimFwAEgYmFdnLR7Tbu3Q L0wKp9yDpal6Yl/VibS2SYey62rf885LJn01MbN77pVWUK7zaT7mjZuUJV55ulVL59BHlu4a2wJ/ jzALmUAeSeJIuQe63SMJD/oQMc9fwu78TbGyV1jncQmiRYycb0KOjNtzyF4GFK9dCPM0NfkunICw fPh8/GznZ67luKQy6RmybGjlR1I+3mrx4FzU8H8C34m37oK+KyXaZcbI6jQNyUCNe5zpZssasH6n 6LHANx/vt1dcjsjPACArRxFKOl7avG/m3c20ut6/wgwq/+AjGp8TzOqq2ab4DpRthf10/8NCzkBj 5CghiXW1l42lMjYpe+UbVJ56xGbVqMTn7he9hpKj21JNonun9r/8Ays6S33UmTGEVEHuJZRVeDaa cvvu1qux1pEfONO2KFB4Xc0dxHW9KaRv7Y9343kcNTOk34LLgAnmAIFmGknKxsm5GvmRWDp1M9ge AXdgq4ip/0JYi7lHhFweClU8r/5Z/+0FwquQgiTJQYfzjEPUgWpqvVwUDXeXAeIGr0UViDQU/Yjv 6W8RqbSkYXL3XWWewoDM39ZPGwUutzE40WqOoZG6/sZbp467d48SFExcUKVWg4Nk9vi2IEleEwAe lQ+8bb3G0E0GrkIb9mRJXBw+bVmsnXr3o8tbmtDbraOX1G7GQO/77x2TI+TVxvzirgaEsWBvKKCC HsHiOa6OVIB2Ipw9GA/CSWFT00aDQZpopI/wj0VCtgziaejhwQD2vCF8KzYJAY6/OCpcEPlKZFWA HTgdRy08zOZzVQ9fkNedw0sR4ArqYjLWjyA36Bx5PsxlbK1gdh7XgFjyEMYRtuYarKsLOSKfEy8Z iRR+533oXk54NIweBTqWT3OSd90RnMiF/GORlrjzCWQGl6DPL0RztKzSjfK09YHcrSxsN/CA/aKr 7725STALMeckwaaoB7Tm1q2dHdKFavScQcq5CaLw== From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Wed, 4 Jan 2023 10:37:50 +0800 X-OQ-MSGID: <20230104023750.50653-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <05dd8dab-ef3a-45c1-8793-10567275f2e5@EX-SZ063.tencent.com> References: <05dd8dab-ef3a-45c1-8793-10567275f2e5@EX-SZ063.tencent.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 4/4] avcodec/videotoolboxenc: fix error code 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: Zhao Zhili 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: From: Zhao Zhili 1. Fix return 0 on error. 2. Fix return OS error code passthrough. --- v2: fix commit message libavcodec/videotoolboxenc.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libavcodec/videotoolboxenc.c b/libavcodec/videotoolboxenc.c index 3b00e542cb..56971471e4 100644 --- a/libavcodec/videotoolboxenc.c +++ b/libavcodec/videotoolboxenc.c @@ -2555,6 +2555,7 @@ static int vtenc_populate_extradata(AVCodecContext *avctx, pool = VTCompressionSessionGetPixelBufferPool(vtctx->session); if(!pool){ av_log(avctx, AV_LOG_ERROR, "Error getting pixel buffer pool.\n"); + status = AVERROR_EXTERNAL; goto pe_cleanup; } @@ -2564,6 +2565,7 @@ static int vtenc_populate_extradata(AVCodecContext *avctx, if(status != kCVReturnSuccess){ av_log(avctx, AV_LOG_ERROR, "Error creating frame from pool: %d\n", status); + status = AVERROR_EXTERNAL; goto pe_cleanup; } @@ -2581,7 +2583,7 @@ static int vtenc_populate_extradata(AVCodecContext *avctx, AV_LOG_ERROR, "Error sending frame for extradata: %d\n", status); - + status = AVERROR_EXTERNAL; goto pe_cleanup; } @@ -2589,8 +2591,10 @@ static int vtenc_populate_extradata(AVCodecContext *avctx, status = VTCompressionSessionCompleteFrames(vtctx->session, kCMTimeIndefinite); - if (status) + if (status) { + status = AVERROR_EXTERNAL; goto pe_cleanup; + } status = vtenc_q_pop(vtctx, 0, &buf, NULL); if (status) { -- 2.35.3 _______________________________________________ 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".