From patchwork Fri Jun 24 05:59:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 36410 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b27:b0:88:1bbf:7fd2 with SMTP id l39csp106429pzh; Thu, 23 Jun 2022 23:01:34 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sie5nZgci8NRoIWBvpZ3MZz+W8CqwrJ+3snziTTYtwYTvXBYaakeVyJViDH9jOCEgoN/5k X-Received: by 2002:a17:907:d0d:b0:711:d554:1c8f with SMTP id gn13-20020a1709070d0d00b00711d5541c8fmr11733522ejc.223.1656050493789; Thu, 23 Jun 2022 23:01:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656050493; cv=none; d=google.com; s=arc-20160816; b=omdUAGnj/SGYm564pYC9jBFgbrd1uAojoYQScD0AYTvgl6aBygfrv6Nnz+2Aq1/dLu 3oj0ACtF9cJqi5WsW/a6s7Kki7O7pVMFFl6M5frOED0ROQYWsC4PEd2WmidCa6A5uSnm e6X1j2N+ItsRzeMqHJKyuI0x0k0m0DwWSXnvbgnpCWnDirY8axq8SL0hhp9M3tg5ZLkv 2PdDLEayu4vR9qtWk5zMcnwCnAAEesUgHFWd3xFFgbgSx4WcxaoHGnm7y8WQpDIBoG3l wJESXyov/t8TihU3Lv4O/8YRFtqr9YAiKyRt/m8jNsBpu6Y+dbAt4oWi9xXQsbZJ7kBq kvbA== 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:feedback-id:mime-version:references :in-reply-to:message-id:date:to:from:delivered-to; bh=7t3BNbZex7ib6VtaxnhI6ALHAftr82kXvVazM4u6ang=; b=L/QRZ/3toYmA16yDmDQ2ld0XznotGIbWYVMFFUg/YvNBPvs1fnKGZB9TccoOxMZc2g K5WDYB9ww1WpuTbBGDak2NflmeCGC8AfKGPWDj+29dGyMK7WzbqRpNlkg/gujhEoEkq7 OXkqePew5WP9THiWfJ72OgibHNQKkXFRJVaEmsmJ7WeQZP+aKamDwPy6y1tevgzupoQs rjNdNCgJdJPvleTijleddMLwcza1TFa9MQ1l9quSAGR9Xm8zol/P3LqELoffzvk/zTu8 xLd4ud6k55osor5vi5g09hdz566GH4yFfNgWtHmdxvM8vk9/lozkaUb19DE72P6CW4wM pGVQ== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id jr23-20020a170906a99700b00703e424d757si1287245ejb.400.2022.06.23.23.01.31; Thu, 23 Jun 2022 23:01:33 -0700 (PDT) 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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A7AB168B704; Fri, 24 Jun 2022 09:01:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpbg.qq.com (smtpbg123.qq.com [175.27.65.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7794668B335 for ; Fri, 24 Jun 2022 09:01:20 +0300 (EEST) X-QQ-mid: bizesmtp70t1656050403tm4iimfz Received: from localhost ( [103.107.217.226]) by bizesmtp.qq.com (ESMTP) with id ; Fri, 24 Jun 2022 14:00:01 +0800 (CST) X-QQ-SSF: 01100000002000Z0Z000000A0000000 X-QQ-FEAT: 73SlNYRUNlJnEryBeZtJbvTb7WL1wNFSm74Jg72H1aXVkwMXmn6Yb9bfSXyX4 la1ljDAq7j5ZKuPR4uhU+yO0xLRS4sJHOSkkR4id1yA2pcKddVliG9YCUaxsCt2aA3NoXBi o0dXCfF3l03TYVoXrel4hjJKdnvk+77XlTjY1iCAH5HBRA8R+14wVIqnsfN3t75j/Nevw0z WIA7w45bb9JN8lEw13M0w9SkNxeiaiauoL9eEcPWUKnxP1RfbXbgVyqj2RB0lSPScNeJbEt ZiM/VD4V1tLR6f1Nt5nl+EhNYv9MWaIbwCjIYI17nyY7sIHs+8JMeh+2VZ25xvh0E6TtTQS eTD4cXz X-QQ-GoodBg: 0 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Jun 2022 13:59:57 +0800 Message-Id: <20220624055957.48149-1-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: References: MIME-Version: 1.0 X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:chinaffmpeg.org:qybgspam:qybgspam8 Subject: [FFmpeg-devel] [PATCH v2] avcodec/audiotoolboxenc: return external error if encode failed 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: Steven Liu Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: A7q5eJW97hIu because the AudioConverterFillComplexBuffer can return 0 or 1 if success. so set the ret to 0 it AudioConverterFillComplexBuffer success and return ret value for success or return AVERROR_EXTERNAL when AudioConverterFillComplexBuffer failed. BTW change the error message log level from warning to error. Signed-off-by: Steven Liu --- libavcodec/audiotoolboxenc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavcodec/audiotoolboxenc.c b/libavcodec/audiotoolboxenc.c index f8305ab89b..00293154bf 100644 --- a/libavcodec/audiotoolboxenc.c +++ b/libavcodec/audiotoolboxenc.c @@ -554,11 +554,13 @@ static int ffat_encode(AVCodecContext *avctx, AVPacket *avpkt, avctx->frame_size, &avpkt->pts, &avpkt->duration); + ret = 0; } else if (ret && ret != 1) { - av_log(avctx, AV_LOG_WARNING, "Encode error: %i\n", ret); + av_log(avctx, AV_LOG_ERROR, "Encode error: %i\n", ret); + ret = AVERROR_EXTERNAL; } - return 0; + return ret; } static av_cold void ffat_encode_flush(AVCodecContext *avctx)