From patchwork Wed Jan 4 02:37:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 39862 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp8505392pzb; Tue, 3 Jan 2023 18:38:05 -0800 (PST) X-Google-Smtp-Source: AMrXdXt7asY1AmfPsLiquP+Tk0IB56JebMek8fYe1/S3t1qV48WhgtOU65p5eqoGTqNgnuQlDAnO X-Received: by 2002:a17:907:80ca:b0:7c1:540c:e214 with SMTP id io10-20020a17090780ca00b007c1540ce214mr41286595ejc.47.1672799885267; Tue, 03 Jan 2023 18:38:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672799885; cv=none; d=google.com; s=arc-20160816; b=hxwuHzSwlvVfyAkAFS3PWShDlnzcQ7ZKMgRobdVRG0lbTPKEXF3dGV3tkJsS3LnDO1 NQYlN6IzT/pXgVVA6lZT0rUJVbZJLgD7MzGkQ/Wpr+YScTX3XG494hmWct/tE5V4lrVq snX+plM8mJfiJfuoxX8ZLe9ixbUq3E/pQbQQjG8Ira1VBZImFTgzGka1Aq2UalH38fhk jFd0pQzhgtRWAzPG6t5AHkj1iEZKLeSVSmVhwjynwpp3yo7hIbBmV/6udgHK3MK7Bw1c ZHQxpvw2sDxFqy9qD7H+BrOknNCXijJ5s4Zush9kvR2j32HTrU9W3GvU6Ltzedmza8Rf gXDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to:date :to:from:message-id:dkim-signature:delivered-to; bh=XqmEoZoAhJds1/q3r9gpGje2K4OQcUt28LcR6UVc3Fw=; b=b8zUVWQdFP/DUgpMJwYMOohcOgn1WN/OBRZC22aSHR2+wZLDX4kSnKTawbVuVfuUM7 T+VOtkqlbo5p38nYVrz7Cg3BGoNFuCS/ri2rtFgrcMSe/vlUCmSSvgwwf7Qes732AQEW 5dInwUcnOusSyUF5VKI1LcMhfpSxIMoMIvgxrkJXNRJ+UdFsPW3g1/SprP5cI9BxXYh6 kRuidJhbwnjfFJcN9BmNXvVSVdu1AitwHZCQC/PEyI81+7YTrTFCgji6Z8Qw8cuRfT8m AqSwQ/2wQ+6qe6DiL2uBehNjUAuGEKJGYyWElVmAW9E6ZYwLKQyxiiRhVcqEToCdM4Ih GshA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=KJ7mzr2I; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id z13-20020a50eb4d000000b0048aa3eebb6dsi10970230edp.611.2023.01.03.18.38.05; Tue, 03 Jan 2023 18:38:05 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=KJ7mzr2I; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E837068BDE7; Wed, 4 Jan 2023 04:38:02 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: e4AzZbFCQbqw 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) {