From patchwork Wed Jan 4 02:35:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 39861 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp8504627pzb; Tue, 3 Jan 2023 18:35:39 -0800 (PST) X-Google-Smtp-Source: AMrXdXvfQJj5PqJAulvENRL8936mnfODg0CURU9JdepuPuqEij2pbWqDsIrJHcjBcUMG1mj4xHKV X-Received: by 2002:a05:6402:33a:b0:461:2030:71ce with SMTP id q26-20020a056402033a00b00461203071cemr37705399edw.30.1672799739082; Tue, 03 Jan 2023 18:35:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672799739; cv=none; d=google.com; s=arc-20160816; b=D903+eC+bEXV5tA1+BJPQyhSMz0NfesApdlAx+RihAicvZuvXa0LJPRjDJmzTF58Fr FO8fVoE9ky/Jj/Tr7amXQXaMK0pJx64S+1hNiaW2fpllMKVzBxrMfeBEKYUsXecUL6wL LGDFfK01eBt7bMdu6MxMk36BcNqPWIyzOAArvnHUBs2oJgLd/qBeGJK4sqlEzq3zlPQb s1U+qnZl+amH+zGt5LV+9Ch4OweLpB79mclJKwpMOleUy7QMdu1vD7/ydIErmGM9nBuG PrzgSOKoAYwEpQnJUUPxwdJvfRkCcrRje5yK1ORD7KGnqDVytd9r/k+vKVXTzf+6quHo j4zA== 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:date:to:from:message-id :dkim-signature:delivered-to; bh=6xJtjQDE3wvkKbsFA/I0u2TwCaweRaNmhUnGfZjoXvI=; b=jkp+Jl8bhjs0WWZY3lutLqa4KqaXxUIv0AqBa+jfT+Qa/3PDmRS+eaOTwTE5rlx11M ZennYCCnlCCttUldApwLpZzUvNFMFqXO5Eglx3TzI92kjTlC0wcmrEYg3rqjlzuO0r7D 43SbrEUL5RDEqmBZF2irwkX/tJi0KGArGcAlL9rbXgXN3ryIfuhcq/PY33mxcP5PAF7B gpQx5CH7z5xlNZWwEwkZ9diXRJUxXZYURiGq1+lAFSMfd19YlOPmRkhTi8xuw3UHlUqS 9DnW7TBQ+IjYMaCCzrjiFhqxQpfZZ9o4pJxs5ioJj/hCgBEOIxGYyCYEN5bbVSeRtPje XSxQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=Yn1K3svf; 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 u26-20020a50951a000000b0046b32882b04si28575369eda.440.2023.01.03.18.35.37; Tue, 03 Jan 2023 18:35:39 -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=Yn1K3svf; 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 4E5B868BD2E; Wed, 4 Jan 2023 04:35:33 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-221-192.mail.qq.com (out203-205-221-192.mail.qq.com [203.205.221.192]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2499168BD2E for ; Wed, 4 Jan 2023 04:35:25 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1672799720; bh=ZJH54KVeo6L36hI6CWtY58Rb/LniuB0z2bxi9KDZ8Dk=; h=From:To:Cc:Subject:Date; b=Yn1K3svfqW1thmkrxFP5gvy9imXVXYEfwyAEE4FZ32GmHm/ZljsFObAeuJg4cIsXj Swo74OQS4q8kdz8IMtToVcgQE64VUHyhF+xQVypoOOursB4vbMZWlTzD14OezD9bSF Bu3mcU5QcZQ1AOgvwDjNTmYbN0c+NDDh6sHS57xo= Received: from ZHILIZHAO-MB2.tencent.com ([119.147.10.191]) by newxmesmtplogicsvrszb9-0.qq.com (NewEsmtp) with SMTP id 8D2ABCAA; Wed, 04 Jan 2023 10:35:18 +0800 X-QQ-mid: xmsmtpt1672799718tab6qjcug Message-ID: X-QQ-XMAILINFO: N7h1OCCDntujbD7C7IUGcMqsoUhopttRdDsWEqUSJu+jEhuQBWOgEk/gz8W9gi yOjlW1x5EsmtzKsT7LCNAzINFhuP88NxBmg5bF5MFVb2873W06h+LdX8IRCb+fi6pp39OYlZb31I W9tiX4j0fc1XFwNfl42o013g1MND6SYtuJ6ILAP9O0xBgEQ7EZZTG0ZvZZw/Ia8FBJx0cGdkLtPB VnSu5qqZBKvmEtLvRKT8AHG8o7QgKsrPmC25/ZxaPIHbXVOtx+0C822SrBQ6dYxrfMwXeOP4KGiu P8BWRftpCpa79ZgFzsCJpeL9q6phU4f9NQ2xJ6NTeZweli4lI/MhxMIlROUGVXgJkE0qYvNMjDqs Rpw42zpYfPPDxXGCRiq4lGliMizwvOqBxAKsTz+SneMTn2gjea4e0KtyToXKcpD2LOppaoOJRtpP Pc5CzSHS0Q3WeAJxaumP4xx6ooEfOGipLHitXgAlfaQWQXNx3CVKndwRpsKomFm/8elLskcdQ0CV fy8F53+f/7x6L8h45U+x4T0+mlekaS/lpStVitW1WQrpMKhOjugjBqAkz6yYhNiRog6XvYYZOzMI eh9DdjMI+x4c8UFOHxT8Ik+WtzqCbY4TTzWT4Prv3PqASyEUc7Hg0h3WtTg7cNhqLlPw5MJEgDM9 mmdZOsqCoBC0Cfr2VJKvIsrzmp+MPehxY36Ce8T/31jAC6ThwORVqujDZuGfNHO9nJsbtr6iCqKl EiOD2wr5PpkpW95Dxc2fO+HHHVaj21IOIfNXQzafHG1bBJYbC3DT+AfYNb2DqTwuUzwqpiuKLaQ6 IIozKcy3th6tDJVkRHasBhDodBGYHs6JqY7HNVmz1O7YmAEmmkL2mC/Ls+mfnjOmzgCKxMVrBYi2 ND81YW32jSNXC8Vv//QYehQXKNkAY91ImPcjGZUyhtnFad9IMdB2zIMkLioPvtKb5iByz1zju7JS nqz6LYGp6g/QRcihdlbg== From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Wed, 4 Jan 2023 10:35:17 +0800 X-OQ-MSGID: <20230104023517.50187-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 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: LRHxPA4YhxYz From: Zhao Zhili 1. Fix return 0 on success. 2. Fix return OS error code passthrough. --- 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) {