From patchwork Tue Jun 28 16:14:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 36514 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b27:b0:88:1bbf:7fd2 with SMTP id l39csp2748809pzh; Tue, 28 Jun 2022 09:15:12 -0700 (PDT) X-Google-Smtp-Source: AGRyM1syLLlyOvpaRe69qsEcPLwOER41BZkVW5X61k389BWiAP2n8XW0F804WzTjwtUq9u2gHMDF X-Received: by 2002:a05:6402:492:b0:437:4b50:d616 with SMTP id k18-20020a056402049200b004374b50d616mr18705048edv.43.1656432912298; Tue, 28 Jun 2022 09:15:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656432912; cv=none; d=google.com; s=arc-20160816; b=Ha2hNmKcZTETLNZV796LFrjPMvyH2a/tlEAOmwc4cN1q3pajd0TzE/A6QVnLd8Kqrm QrL6Dx9r6DTqwbDEfgIO8Ver6VBshIulImW5hF/vVSr5cMIdJAhGORC/L9MpQkjA481e N0kMrvjuASJzMpdogjxFw2UYK/rohtfvkt0m/+bPRa3kUZhaSDQfFpkDI44TxduXPh8n q00G6yg/CZhruBM+HKRIPvA2oG6EHdbv/ZIHGDL403N9U0rNJgnUV5QnVuBuNUr8lyR2 lDX2wbyKpJzDkrRVbN57hZKb8e8MuCSO5vkZjRqb+d0JTKMxUwt4luC4lM4IZPhHOJaH zVfg== 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=t0Wj+VtS3nL6j4OkD3njUtuii+zbFnYfxXQY4S0Oh+4=; b=FL34CFZ303FtqVNQcXnreipe1gQigfW2p/TpQjf+rwyMiQBHMsWW2R4JGiJWjAPJmp Yp++yg+u9XhVrT/mWmx6YVwlIIKjFhq8+xqZOR5gS3H66mM2r7Ep39dSj5VIib5KbdJd Hhl/cGqfIsWZ/slsCPmUERrYqwh+i6Nr+6NYpAjccVBFME4+TOT0L8rR7bAt6V0VonwO In9aC4TVXlbLfotDeeooOFoFtRsiO4u1aPdg75mHC3kpB/oTF+7b7TSujyKBop84eTkS 67BHr51J2zmT59/LGVrsTMa1AbpE8SMqj4so/i+dAiKW3XjLArcAbaScDy7KSNcm2SJ+ V4iQ== 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 n26-20020aa7c45a000000b0043602f1f761si15664200edr.340.2022.06.28.09.15.11; Tue, 28 Jun 2022 09:15:12 -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 B621668B981; Tue, 28 Jun 2022 19:15:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpbg.qq.com (smtpbg136.qq.com [106.55.201.188]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9690D68B96D for ; Tue, 28 Jun 2022 19:14:59 +0300 (EEST) X-QQ-mid: bizesmtp72t1656432892ta8rjvfx Received: from localhost ( [114.245.19.167]) by bizesmtp.qq.com (ESMTP) with id ; Wed, 29 Jun 2022 00:14:52 +0800 (CST) X-QQ-SSF: 01100000002000Z0Z000B00A0000000 X-QQ-FEAT: glREbVAB0pLmG/Hobf4rPDUEhgu3M60S6ocHrOrhDLyo2N52e2aFUoqQ0drc5 sMbsznzk4yJ+HPnjT8gOtTIDUFXzHgorMjDbY0qgWv67zTvkPQsSnLrbWgnS80T07r1ndrP dYXKSmiBipomq+PYmX5j0GHTkC3uYzuUYUIZ7npmKcUmFr6CeT3wOAO71wIxJHC4ZGGUqR8 +7uEHVUgCKYf0HH9PtCRJZgconCXBbAa/FL7k1apokn89pz56Ooic4uEDi2YQH6wmR/jygt YCgsNjf1OZP/fugpW/6bNJfJtll4nFzWV6wsJZOhG9VpYy67JRnyqjg7Y= X-QQ-GoodBg: 0 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Wed, 29 Jun 2022 00:14:08 +0800 Message-Id: <20220628161408.15410-1-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:chinaffmpeg.org:qybgspam:qybgspam7 Subject: [FFmpeg-devel] [PATCH] avcodec/audiotoolboxenc: return AVERROR_EXTERNAL immediately when encode error 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 , Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: GBP2kHt8Z/tP Just return AVERROR_EXTERNAL immediately when encode error. The other logic should keep the old behavior before commit 7c05b7951. Suggested-By: Zhao Zhili Signed-off-by: Steven Liu --- libavcodec/audiotoolboxenc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavcodec/audiotoolboxenc.c b/libavcodec/audiotoolboxenc.c index 00293154bf..8bbaabd960 100644 --- a/libavcodec/audiotoolboxenc.c +++ b/libavcodec/audiotoolboxenc.c @@ -554,13 +554,12 @@ 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_ERROR, "Encode error: %i\n", ret); - ret = AVERROR_EXTERNAL; + return AVERROR_EXTERNAL; } - return ret; + return 0; } static av_cold void ffat_encode_flush(AVCodecContext *avctx)