virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

avcodec/extract_extradata_bsf: make sure a Sequence Header was found for av1

Browse Source 
A packet may have Metadata OBUs but no Sequence Header OBU, which is
useless as extradata.

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer
2018-07-20 20:43:40 -03:00
parent 5abbb1430d
commit 3870ed7ab3
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/extract_extradata_bsf.c
View File

@@ -67,7 +67,7 @@ static int extract_extradata_av1(AVBSFContext *ctx, AVPacket *pkt,
int extradata_size = 0, filtered_size = 0; int extradata_size = 0, filtered_size = 0;
int nb_extradata_obu_types = FF_ARRAY_ELEMS(extradata_obu_types); int nb_extradata_obu_types = FF_ARRAY_ELEMS(extradata_obu_types);
int i, ret = 0; int i, has_seq = 0, ret = 0;
ret = ff_av1_packet_split(&s->av1_pkt, pkt->data, pkt->size, ctx); ret = ff_av1_packet_split(&s->av1_pkt, pkt->data, pkt->size, ctx);
if (ret < 0) if (ret < 0)
@@ -77,12 +77,14 @@ static int extract_extradata_av1(AVBSFContext *ctx, AVPacket *pkt,
AV1OBU *obu = &s->av1_pkt.obus[i]; AV1OBU *obu = &s->av1_pkt.obus[i];
if (val_in_array(extradata_obu_types, nb_extradata_obu_types, obu->type)) { if (val_in_array(extradata_obu_types, nb_extradata_obu_types, obu->type)) {
extradata_size += obu->raw_size; extradata_size += obu->raw_size;
if (obu->type == AV1_OBU_SEQUENCE_HEADER)
has_seq = 1;
} else if (s->remove) { } else if (s->remove) {
filtered_size += obu->raw_size; filtered_size += obu->raw_size;
} }
} }
if (extradata_size) { if (extradata_size && has_seq) {
AVBufferRef *filtered_buf; AVBufferRef *filtered_buf;
uint8_t *extradata, *filtered_data; uint8_t *extradata, *filtered_data;