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 DDBCE45901 for ; Mon, 27 Mar 2023 19:09:25 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8B20568CB3A; Mon, 27 Mar 2023 22:09:23 +0300 (EEST) Received: from iq.passwd.hu (iq.passwd.hu [217.27.212.140]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5854668CAB1 for ; Mon, 27 Mar 2023 22:09:17 +0300 (EEST) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 6E0D8E8A2F for ; Mon, 27 Mar 2023 21:08:59 +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 KgbnEaTwHFbq for ; Mon, 27 Mar 2023 21:08:55 +0200 (CEST) Received: from iq (iq [217.27.212.140]) by iq.passwd.hu (Postfix) with ESMTPS id 6766BE20B3 for ; Mon, 27 Mar 2023 21:08:54 +0200 (CEST) Date: Mon, 27 Mar 2023 21:08:54 +0200 (CEST) From: Marton Balint To: FFmpeg development discussions and patches In-Reply-To: Message-ID: References: <20230327080023.28400-1-anton@khirnov.net> MIME-Version: 1.0 Subject: Re: [FFmpeg-devel] [PATCH] lavf: return AVERROR_EOF rather than EIO on 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 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 Mon, 27 Mar 2023, Marton Balint wrote: > > > On Mon, 27 Mar 2023, Anton Khirnov wrote: > >> --- >> libavformat/anm.c | 2 +- >> libavformat/dauddec.c | 2 +- >> libavformat/filmstripdec.c | 2 +- >> libavformat/idroqdec.c | 2 +- >> libavformat/sol.c | 3 ++- >> libavformat/vc1test.c | 2 +- >> 6 files changed, 7 insertions(+), 6 deletions(-) > > Aren't these supposed to return AVERROR_INVALIDDATA? Beacuse these are most > likely premature EOF-s when the file is truncated. Disregard my comment, I can see now that these are all in the beginning of read_packet(). Regards, Marton > > Regards, > Marton > >> >> diff --git a/libavformat/anm.c b/libavformat/anm.c >> index 7feba4ed1e7..f2ac6958a9a 100644 >> --- a/libavformat/anm.c >> +++ b/libavformat/anm.c >> @@ -172,7 +172,7 @@ static int read_packet(AVFormatContext *s, >> int tmp, record_size; >> >> if (avio_feof(s->pb)) >> - return AVERROR(EIO); >> + return AVERROR_EOF; >> >> if (anm->page < 0) >> return anm->page; >> diff --git a/libavformat/dauddec.c b/libavformat/dauddec.c >> index dbbd39a3b40..0cbf7e4e368 100644 >> --- a/libavformat/dauddec.c >> +++ b/libavformat/dauddec.c >> @@ -41,7 +41,7 @@ static int daud_packet(AVFormatContext *s, AVPacket >> @@ *pkt) { >> AVIOContext *pb = s->pb; >> int ret, size; >> if (avio_feof(pb)) >> - return AVERROR(EIO); >> + return AVERROR_EOF; >> size = avio_rb16(pb); >> avio_rb16(pb); // unknown >> ret = av_get_packet(pb, pkt, size); >> diff --git a/libavformat/filmstripdec.c b/libavformat/filmstripdec.c >> index 2b6ba63fcf0..000f807181d 100644 >> --- a/libavformat/filmstripdec.c >> +++ b/libavformat/filmstripdec.c >> @@ -86,7 +86,7 @@ static int read_packet(AVFormatContext *s, >> AVStream *st = s->streams[0]; >> >> if (avio_feof(s->pb)) >> - return AVERROR(EIO); >> + return AVERROR_EOF; >> pkt->dts = avio_tell(s->pb) / (st->codecpar->width * >> (int64_t)(st->codecpar->height + film->leading) * 4); >> pkt->size = av_get_packet(s->pb, pkt, st->codecpar->width * >> st->codecpar->height * 4); >> avio_skip(s->pb, st->codecpar->width * (int64_t) film->leading * 4); >> diff --git a/libavformat/idroqdec.c b/libavformat/idroqdec.c >> index c9fc972780a..01ea2bb77ba 100644 >> --- a/libavformat/idroqdec.c >> +++ b/libavformat/idroqdec.c >> @@ -107,7 +107,7 @@ static int roq_read_packet(AVFormatContext *s, >> while (!packet_read) { >> >> if (avio_feof(s->pb)) >> - return AVERROR(EIO); >> + return AVERROR_EOF; >> >> /* get the next chunk preamble */ >> if ((ret = avio_read(pb, preamble, RoQ_CHUNK_PREAMBLE_SIZE)) != >> diff --git a/libavformat/sol.c b/libavformat/sol.c >> index b92cfb36fee..a276642728c 100644 >> --- a/libavformat/sol.c >> +++ b/libavformat/sol.c >> @@ -127,7 +127,8 @@ static int sol_read_packet(AVFormatContext *s, >> int ret; >> >> if (avio_feof(s->pb)) >> - return AVERROR(EIO); >> + return AVERROR_EOF; >> + >> ret= av_get_packet(s->pb, pkt, MAX_SIZE); >> if (ret < 0) >> return ret; >> diff --git a/libavformat/vc1test.c b/libavformat/vc1test.c >> index 67edc699c5f..f63ffee69bb 100644 >> --- a/libavformat/vc1test.c >> +++ b/libavformat/vc1test.c >> @@ -101,7 +101,7 @@ static int vc1t_read_packet(AVFormatContext *s, >> uint32_t pts; >> >> if(avio_feof(pb)) >> - return AVERROR(EIO); >> + return AVERROR_EOF; >> >> frame_size = avio_rl24(pb); >> if(avio_r8(pb) & 0x80) >> -- >> 2.39.1 >> >> _______________________________________________ >> 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". >> > _______________________________________________ > 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". > _______________________________________________ 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".