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 244DC46D6F for ; Mon, 10 Jul 2023 12:47:34 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C556268C4F4; Mon, 10 Jul 2023 15:47:31 +0300 (EEST) Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 11D5668C350 for ; Mon, 10 Jul 2023 15:47:26 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id A2FED2404EC; Mon, 10 Jul 2023 14:47:25 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id ocmjN9w4Kn1P; Mon, 10 Jul 2023 14:47:25 +0200 (CEST) Received: from lain.khirnov.net (lain.khirnov.net [IPv6:2001:67c:1138:4306::3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "lain.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id E5C292404EA; Mon, 10 Jul 2023 14:47:24 +0200 (CEST) Received: by lain.khirnov.net (Postfix, from userid 1000) id BCE591601B2; Mon, 10 Jul 2023 14:47:24 +0200 (CEST) From: Anton Khirnov To: FFmpeg development discussions and patches In-Reply-To: =?utf-8?q?=3CGV1P250MB0737CBAF57E68F4DD8CE0F9F8F33A=40GV1P250MB?= =?utf-8?q?0737=2EEURP250=2EPROD=2EOUTLOOK=2ECOM=3E?= References: =?utf-8?q?=3CGV1P250MB0737CBAF57E68F4DD8CE0F9F8F33A=40GV1P250MB0?= =?utf-8?q?737=2EEURP250=2EPROD=2EOUTLOOK=2ECOM=3E?= Mail-Followup-To: FFmpeg development discussions and patches , Andreas Rheinhardt Date: Mon, 10 Jul 2023 14:47:24 +0200 Message-ID: <168899324473.27367.17259716301702650981@lain.khirnov.net> User-Agent: alot/0.8.1 MIME-Version: 1.0 Subject: Re: [FFmpeg-devel] [PATCH] avcodec/decode: Return EAGAIN instead of overwriting unused packet 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: Andreas Rheinhardt 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: Quoting Andreas Rheinhardt (2023-07-10 01:36:41) > Should fix #10457, a regression caused by > 69516ab3e917a6e91d26e38d04183c60fd71cbab. > > Signed-off-by: Andreas Rheinhardt > --- > I am not sure about this one. The problem is that avcodec_send_packet() > and avcodec_receive_frame() must not return EAGAIN at the same time. > If buffer_frame contains a frame when entering avcodec_send_packet(), > the next call to avcodec_receive_frame() will not return EAGAIN. > But is this actually guaranteed if buffer_pkt is not empty? It's not guaranteed, but I believe the correct interpretation of the "must not return EAGAIN at the same time" line is that send->receive->send must make progress and not be 3x EAGAIN. > > libavcodec/decode.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/libavcodec/decode.c b/libavcodec/decode.c > index 269633ce10..6595c3ca34 100644 > --- a/libavcodec/decode.c > +++ b/libavcodec/decode.c > @@ -666,6 +666,9 @@ int attribute_align_arg avcodec_send_packet(AVCodecContext *avctx, const AVPacke > if (avpkt && !avpkt->size && avpkt->data) > return AVERROR(EINVAL); > > + if (!AVPACKET_IS_EMPTY(avci->buffer_pkt)) > + return AVERROR(EAGAIN); > + > av_packet_unref(avci->buffer_pkt); This unref here becomes redundant. Otherwise looks good, thanks. -- Anton Khirnov _______________________________________________ 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".