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 7199C4574F for ; Sun, 23 Apr 2023 09:13:24 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 83CA468BF81; Sun, 23 Apr 2023 12:13:21 +0300 (EEST) Received: from iq.passwd.hu (iq.passwd.hu [217.27.212.140]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A59E668BE48 for ; Sun, 23 Apr 2023 12:13:15 +0300 (EEST) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id B135EE8852 for ; Sun, 23 Apr 2023 11:12:40 +0200 (CEST) X-Virus-Scanned: amavisd-new at passwd.hu Received: from iq.passwd.hu ([127.0.0.1]) by localhost (iq.passwd.hu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id JeygMoAg2npm for ; Sun, 23 Apr 2023 11:12:38 +0200 (CEST) Received: from iq (iq [217.27.212.140]) by iq.passwd.hu (Postfix) with ESMTPS id 43802E8610 for ; Sun, 23 Apr 2023 11:12:38 +0200 (CEST) Date: Sun, 23 Apr 2023 11:12:38 +0200 (CEST) From: Marton Balint To: FFmpeg development discussions and patches In-Reply-To: <168217824856.3843.12078608174603704828@lain.khirnov.net> Message-ID: <2154f93d-aa9-21da-966-a18399b33bf1@passwd.hu> References: <168217824856.3843.12078608174603704828@lain.khirnov.net> MIME-Version: 1.0 Subject: Re: [FFmpeg-devel] [PATCH v2] fftools/ffmpeg_mux: fix reporting muxer EOF as 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 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On Sat, 22 Apr 2023, Anton Khirnov wrote: > Quoting Zhao Zhili (2023-04-22 14:56:34) >> From: Zhao Zhili >> >> Fix #10327. >> >> Signed-off-by: Zhao Zhili >> --- >> fftools/ffmpeg_mux.c | 12 +++++++++--- >> 1 file changed, 9 insertions(+), 3 deletions(-) >> >> diff --git a/fftools/ffmpeg_mux.c b/fftools/ffmpeg_mux.c >> index a2e8873ad2..0e1a5d7dc5 100644 >> --- a/fftools/ffmpeg_mux.c >> +++ b/fftools/ffmpeg_mux.c >> @@ -214,9 +214,15 @@ static void *muxer_thread(void *arg) >> ost = of->streams[stream_idx]; >> ret = sync_queue_process(mux, ost, ret < 0 ? NULL : pkt, &stream_eof); >> av_packet_unref(pkt); >> - if (ret == AVERROR_EOF && stream_eof) >> - tq_receive_finish(mux->tq, stream_idx); >> - else if (ret < 0) { >> + if (ret == AVERROR_EOF) { >> + if (stream_eof) { >> + tq_receive_finish(mux->tq, stream_idx); >> + } else { >> + av_log(mux, AV_LOG_VERBOSE, "Muxer %s\n", av_err2str(ret)); > > That seems unnecesarily convoluted, given that we _know_ the error to be > EOF here. Also, please make it "Muxer returned EOF" to make it clear > what exactly is the source of EOF. > > Otherwise ok, feel free to push with this change. This seems like yet another clash of AVERROR_EOF error codes coming from different places with different semantics. For av_interleaved_write_frame(), AVERROR_EOF is an error condition, so file encoding should fail, but after this patch it will not fail, just simply end, because you assume it is legitimately coming from the filesize check... This should be fixed somehow, e.g. use a special error code for the filesize check and only handle that as a legitimate EOF. Regards, Marton _______________________________________________ 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".