From patchwork Tue Jun 28 14:42:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 36513 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b27:b0:88:1bbf:7fd2 with SMTP id l39csp2696233pzh; Tue, 28 Jun 2022 07:43:41 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tNaJmbrb1OlWej8tPleouh9GFVkovyrtbbgl4+uXCju1+tKDTkgR/lyqBt8WgJpujFsPFN X-Received: by 2002:a17:906:51d9:b0:722:eeb2:e7f2 with SMTP id v25-20020a17090651d900b00722eeb2e7f2mr18156661ejk.519.1656427421177; Tue, 28 Jun 2022 07:43:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656427421; cv=none; d=google.com; s=arc-20160816; b=HrD1iflrJFcCIir/mfjhjGYaoyMe0dnRij+gxSL9yBBjpLbnc+cPB/PxyltKuD/oDu 83dtt4lCBxfjn3FVC+bzWvCyPeWX3l41N4pfgFn72pDz5VTpiDT76czwQW0N+jZRFdNI psgRXfJpjwaXm/CNT9Vd6f44YJRdg5ZJdKCFPUkxS9tztOKAW4C8xOTFdcqjuaM/Iqk2 GUe76QSXwixwJ43JZ2lJtj6hjY5/OB0O1FK1qnk99BUe5u8aURUvDh8jdeuPFFWDK8Rt PQJwhoeGq5ZzjIl0dif1WLyXv/E9re+baeCJOrqAUS4oMYrk/b0Cvyi7bWYb8x6C/6zI 3Ikw== 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:message-id:date :to:from:delivered-to; bh=ujdMU+IvVaL7PRSucqT1lonYTHfOdzzKuccjDyKcNYM=; b=Ompy4uDqQpIKlhVAbTcZniIP0WcfdGxqFUPIY7mmJofQSpNDjZo14/iytJvNa6J5YR n/SKlqr1NJUONl4StjdrX78N8dE5/Le7X542qzajCtMI+MO+Uw2r8u/rvczenIyCd+Co w1EopD5e1m3ViV8plEIlQ37dBfd3LMKeVV/Tn53ZM0iVZVq6ytxgHYgylJu15Efd/xdS OkNQX3EqbPdOGtlPokW3KAW816VWY+mSkyu52H/pVSK8QhW6k6OLXaF7onm055B5xY+R RbXp6Z0VypvmHLHeV0v+5DQs+zL7YLyBo51kOaSycHNlVL40X1+lHekal7OWQIM0CFgD 5Iig== 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 cr15-20020a170906d54f00b006f4b2a8c255si17342402ejc.113.2022.06.28.07.43.40; Tue, 28 Jun 2022 07:43:41 -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 9D66B68B959; Tue, 28 Jun 2022 17:43:36 +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 794B268B86A for ; Tue, 28 Jun 2022 17:43:27 +0300 (EEST) X-QQ-mid: bizesmtp65t1656427401tv73nmeu Received: from localhost ( [114.245.19.167]) by bizesmtp.qq.com (ESMTP) with id ; Tue, 28 Jun 2022 22:43:20 +0800 (CST) X-QQ-SSF: 01100000002000Z0Z000000A0000000 X-QQ-FEAT: AYaL7CbwjQ3LTWsLxdVY5L6PG+W7Y97gXkHnw713Pmos+m0QjdalEl3l8D7xX k2zBVdktEPclDCEJ5tt9tBz0waOclzRQGuTfNprKEJnCUbsNrX8Id87Q4rcUCrCAHt/u4DP La4hSsLuxp6bDp2TCJ1r8Z7ophFWkObFGzsNP27B+JZo1txiM1Jkili6iiwWNkL/bhj9RTB n60aUq8gAOD+avkkzgkFNU3FABP1n8OI9EwP31lO6WEZnRf6L6BzCIZHNOw3IP2sm0ys3is stKfggSotFh7zuI0eV/WajEJit4u0mO7dIOl7W2fOYfIONE49OjbfELCW2i40O4x/PfTHFd M3EzZpT/N9W/gyKLOU= X-QQ-GoodBg: 0 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Tue, 28 Jun 2022 22:42:36 +0800 Message-Id: <20220628144236.2155-1-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:chinaffmpeg.org:qybgspam:qybgspam7 Subject: [FFmpeg-devel] [PATCH] avcodec/audiotoolboxenc: return EAGAIN if frame_queue.available is 0 and not at->eof 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: tNgo4SFbSnPp There will return success and failure after commit 7c05b7951cb47716230c95744240bc60ec5f9433. But the AudioConverterFillComplexBuffer will return 1 and *got_packet_ptr is 0 when frame_queue.available == 0 and at->eof == 0. So should return EAGAIN here, this because the encode function should return either 0 or negative error code. Signed-off-by: Steven Liu --- libavcodec/audiotoolboxenc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/audiotoolboxenc.c b/libavcodec/audiotoolboxenc.c index 00293154bf..c23deb06a9 100644 --- a/libavcodec/audiotoolboxenc.c +++ b/libavcodec/audiotoolboxenc.c @@ -558,7 +558,8 @@ static int ffat_encode(AVCodecContext *avctx, AVPacket *avpkt, } else if (ret && ret != 1) { av_log(avctx, AV_LOG_ERROR, "Encode error: %i\n", ret); ret = AVERROR_EXTERNAL; - } + } else if (ret == 1) + ret = AVERROR(EAGAIN); return ret; }