Commit 9614df4b authored by Michael Niedermayer's avatar Michael Niedermayer

avformat/mov: Retry same packet on IO failure to avoid loosing a packet

Based on patch by: Zhang Rui <bbcallen@gmail.com>
Reviewed-by: 's avatarZhang Rui <bbcallen@gmail.com>
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 771537ed
...@@ -4316,6 +4316,13 @@ static AVIndexEntry *mov_find_next_sample(AVFormatContext *s, AVStream **st) ...@@ -4316,6 +4316,13 @@ static AVIndexEntry *mov_find_next_sample(AVFormatContext *s, AVStream **st)
return sample; return sample;
} }
static int should_retry(AVIOContext *pb, int error_code) {
if (error_code == AVERROR_EOF || avio_feof(pb))
return 0;
return 1;
}
static int mov_read_packet(AVFormatContext *s, AVPacket *pkt) static int mov_read_packet(AVFormatContext *s, AVPacket *pkt)
{ {
MOVContext *mov = s->priv_data; MOVContext *mov = s->priv_data;
...@@ -4351,14 +4358,18 @@ static int mov_read_packet(AVFormatContext *s, AVPacket *pkt) ...@@ -4351,14 +4358,18 @@ static int mov_read_packet(AVFormatContext *s, AVPacket *pkt)
} }
if (st->discard != AVDISCARD_ALL) { if (st->discard != AVDISCARD_ALL) {
if (avio_seek(sc->pb, sample->pos, SEEK_SET) != sample->pos) { int64_t ret64 = avio_seek(sc->pb, sample->pos, SEEK_SET);
if (ret64 != sample->pos) {
av_log(mov->fc, AV_LOG_ERROR, "stream %d, offset 0x%"PRIx64": partial file\n", av_log(mov->fc, AV_LOG_ERROR, "stream %d, offset 0x%"PRIx64": partial file\n",
sc->ffindex, sample->pos); sc->ffindex, sample->pos);
sc->current_sample -= should_retry(sc->pb, ret64);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
ret = av_get_packet(sc->pb, pkt, sample->size); ret = av_get_packet(sc->pb, pkt, sample->size);
if (ret < 0) if (ret < 0) {
sc->current_sample -= should_retry(sc->pb, ret);
return ret; return ret;
}
if (sc->has_palette) { if (sc->has_palette) {
uint8_t *pal; uint8_t *pal;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment