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 C54A445E0A for ; Wed, 12 Jul 2023 13:32:11 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 11C6768C5C4; Wed, 12 Jul 2023 16:32:09 +0300 (EEST) Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8A22B68C50A for ; Wed, 12 Jul 2023 16:32:02 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 4A4182404EC for ; Wed, 12 Jul 2023 15:32:02 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id stE6v3715sF6 for ; Wed, 12 Jul 2023 15:32:01 +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 B42632404EA for ; Wed, 12 Jul 2023 15:32:01 +0200 (CEST) Received: by lain.khirnov.net (Postfix, from userid 1000) id 9739A1601B2; Wed, 12 Jul 2023 15:32:01 +0200 (CEST) From: Anton Khirnov To: FFmpeg development discussions and patches In-Reply-To: <54f0bb7d-40b2-0367-e6b4-afd061943386@gmail.com> References: <20230712020644.22606-1-jamrial@gmail.com> <20230712020644.22606-2-jamrial@gmail.com> <168915292003.27367.16639739053405203878@lain.khirnov.net> <54f0bb7d-40b2-0367-e6b4-afd061943386@gmail.com> Mail-Followup-To: FFmpeg development discussions and patches Date: Wed, 12 Jul 2023 15:32:01 +0200 Message-ID: <168916872158.27367.6160923801928996925@lain.khirnov.net> User-Agent: alot/0.8.1 MIME-Version: 1.0 Subject: Re: [FFmpeg-devel] [PATCH 2/2] avcodec/decode: don't discard the buffered packet if the underlying bsf can't take it 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 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 James Almer (2023-07-12 13:40:25) > On 7/12/2023 6:08 AM, Anton Khirnov wrote: > > Quoting James Almer (2023-07-12 04:06:44) > >> Signed-off-by: James Almer > >> --- > >> libavcodec/decode.c | 3 ++- > >> 1 file changed, 2 insertions(+), 1 deletion(-) > >> > >> diff --git a/libavcodec/decode.c b/libavcodec/decode.c > >> index 239ad70b41..cd49cca7c2 100644 > >> --- a/libavcodec/decode.c > >> +++ b/libavcodec/decode.c > >> @@ -242,7 +242,8 @@ int ff_decode_get_packet(AVCodecContext *avctx, AVPacket *pkt) > >> (!AVPACKET_IS_EMPTY(avci->buffer_pkt) || dc->draining_started)) { > >> ret = av_bsf_send_packet(avci->bsf, avci->buffer_pkt); > >> if (ret < 0) { > >> - av_packet_unref(avci->buffer_pkt); > >> + if (ret != AVERROR(EAGAIN)) > >> + av_packet_unref(avci->buffer_pkt); > > > > It seems very wrong for ff_decode_get_packet() to return EAGAIN when > > we have a buffered packet. > > The idea is preventing dropping a packet in the hypothetical case the > bsf can't take it. Is this scenario possible, or is the call to > av_bsf_receive_packet() within the loop ensuring it wont? This block can only be entered if decode_get_packet() returned EAGAIN, which should always mean that the bsf is empty. -- 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".