har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/av1dec: simplify annexb_probe()

Browse Source 
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2019-11-15 20:34:08 -03:00
parent 2703068110
commit 81d54531f7
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libavformat/av1dec.c
View File

@ -75,7 +75,7 @@ static int annexb_probe(const AVProbeData *p)
AVIOContext pb; AVIOContext pb;
int64_t obu_size; int64_t obu_size;
uint32_t temporal_unit_size, frame_unit_size, obu_unit_size; uint32_t temporal_unit_size, frame_unit_size, obu_unit_size;
int seq = 0, frame_header = 0; int seq = 0;
int ret, type, cnt = 0; int ret, type, cnt = 0;
ffio_init_context(&pb, p->buf, p->buf_size, 0, ffio_init_context(&pb, p->buf, p->buf_size, 0,
@ -123,22 +123,25 @@ static int annexb_probe(const AVProbeData *p)
return 0; return 0;
cnt += obu_unit_size; cnt += obu_unit_size;
if (type == AV1_OBU_SEQUENCE_HEADER) switch (type) {
case AV1_OBU_SEQUENCE_HEADER:
seq = 1; seq = 1;
if (type == AV1_OBU_FRAME || type == AV1_OBU_FRAME_HEADER) { break;
if (frame_header || !seq) case AV1_OBU_FRAME:
case AV1_OBU_FRAME_HEADER:
return seq ? AVPROBE_SCORE_EXTENSION + 1 : 0;
case AV1_OBU_TILE_GROUP:
case AV1_OBU_TEMPORAL_DELIMITER:
return 0; return 0;
frame_header = 1; default:
break; break;
} }
if (type == AV1_OBU_TILE_GROUP && !frame_header)
return 0;
temporal_unit_size -= obu_unit_size + ret; temporal_unit_size -= obu_unit_size + ret;
frame_unit_size -= obu_unit_size + ret; frame_unit_size -= obu_unit_size + ret;
} while (!frame_header && frame_unit_size); } while (frame_unit_size);
return frame_header ? AVPROBE_SCORE_EXTENSION + 1 : 0; return 0;
} }
static int annexb_read_header(AVFormatContext *s) static int annexb_read_header(AVFormatContext *s)