RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-27 18:02:11 +00:00
Code Issues Projects Releases Wiki Activity

avformat/av1dec: fix EOF check in Annex-B demuxer

Browse Source 
And return any packet buffered by the bsf.

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2023-06-02 20:22:10 -03:00
parent 65a1e8ee2c
commit da61ed80fd
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
libavformat/av1dec.c
View File

@ -124,13 +124,17 @@ static const AVClass av1_demuxer_class = {
#if CONFIG_AV1_DEMUXER #if CONFIG_AV1_DEMUXER
static int leb(AVIOContext *pb, uint32_t *len) { static int leb(AVIOContext *pb, uint32_t *len, int eof) {
int more, i = 0; int more, i = 0;
uint8_t byte; uint8_t byte;
*len = 0; *len = 0;
do { do {
unsigned bits; unsigned bits;
byte = avio_r8(pb); byte = avio_r8(pb);
if (pb->error)
return pb->error;
if (pb->eof_reached)
return (eof && !i) ? AVERROR_EOF : AVERROR(EIO);
more = byte & 0x80; more = byte & 0x80;
bits = byte & 0x7f; bits = byte & 0x7f;
if (i <= 3 || (i == 4 && bits < (1 << 4))) if (i <= 3 || (i == 4 && bits < (1 << 4)))
@ -139,8 +143,6 @@ static int leb(AVIOContext *pb, uint32_t *len) {
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
if (++i == 8 && more) if (++i == 8 && more)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
if (pb->eof_reached || pb->error)
return pb->error ? pb->error : AVERROR(EIO);
} while (more); } while (more);
return i; return i;
} }
@ -170,15 +172,15 @@ static int annexb_probe(const AVProbeData *p)
ffio_init_context(&ctx, p->buf, p->buf_size, 0, ffio_init_context(&ctx, p->buf, p->buf_size, 0,
NULL, NULL, NULL, NULL); NULL, NULL, NULL, NULL);
ret = leb(pb, &temporal_unit_size); ret = leb(pb, &temporal_unit_size, 1);
if (ret < 0) if (ret < 0)
return 0; return 0;
cnt += ret; cnt += ret;
ret = leb(pb, &frame_unit_size); ret = leb(pb, &frame_unit_size, 0);
if (ret < 0 || ((int64_t)frame_unit_size + ret) > temporal_unit_size) if (ret < 0 || ((int64_t)frame_unit_size + ret) > temporal_unit_size)
return 0; return 0;
cnt += ret; cnt += ret;
ret = leb(pb, &obu_unit_size); ret = leb(pb, &obu_unit_size, 0);
if (ret < 0 || ((int64_t)obu_unit_size + ret) >= frame_unit_size) if (ret < 0 || ((int64_t)obu_unit_size + ret) >= frame_unit_size)
return 0; return 0;
cnt += ret; cnt += ret;
@ -196,7 +198,7 @@ static int annexb_probe(const AVProbeData *p)
cnt += obu_unit_size; cnt += obu_unit_size;
do { do {
ret = leb(pb, &obu_unit_size); ret = leb(pb, &obu_unit_size, 0);
if (ret < 0 || ((int64_t)obu_unit_size + ret) > frame_unit_size) if (ret < 0 || ((int64_t)obu_unit_size + ret) > frame_unit_size)
return 0; return 0;
cnt += ret; cnt += ret;
@ -234,19 +236,24 @@ retry:
} }
if (!c->temporal_unit_size) { if (!c->temporal_unit_size) {
len = leb(s->pb, &c->temporal_unit_size); len = leb(s->pb, &c->temporal_unit_size, 1);
if (len < 0) return AVERROR_INVALIDDATA; if (len == AVERROR_EOF) goto end;
else if (len < 0) return len;
} }
if (!c->frame_unit_size) { if (!c->frame_unit_size) {
len = leb(s->pb, &c->frame_unit_size); len = leb(s->pb, &c->frame_unit_size, 0);
if (len < 0 || ((int64_t)c->frame_unit_size + len) > c->temporal_unit_size) if (len < 0)
return len;
if (((int64_t)c->frame_unit_size + len) > c->temporal_unit_size)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
c->temporal_unit_size -= len; c->temporal_unit_size -= len;
} }
len = leb(s->pb, &obu_unit_size); len = leb(s->pb, &obu_unit_size, 0);
if (len < 0 || ((int64_t)obu_unit_size + len) > c->frame_unit_size) if (len < 0)
return len;
if (((int64_t)obu_unit_size + len) > c->frame_unit_size)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
ret = av_get_packet(s->pb, pkt, obu_unit_size); ret = av_get_packet(s->pb, pkt, obu_unit_size);