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 657CF4017D for ; Wed, 4 Jan 2023 02:35:36 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 19B4B68BD5A; Wed, 4 Jan 2023 04:35:33 +0200 (EET) 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 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 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) { -- 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".