highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/av1: reorder OBUs before writting them in ff_isom_write_av1c()

Browse Source 
Make sure Sequence Header is first, and only allow one of its kind.

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer
2018-07-30 15:15:43 -03:00
parent 692e323d89
commit ded339fb3c
1 changed files with 46 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
libavformat/av1.c
View File

@@ -75,22 +75,45 @@ int ff_av1_filter_obus_buf(const uint8_t *buf, uint8_t **out, int *size)
int ff_isom_write_av1c(AVIOContext *pb, const uint8_t *buf, int size) int ff_isom_write_av1c(AVIOContext *pb, const uint8_t *buf, int size)
{ {
AVIOContext *seq_pb = NULL, *meta_pb = NULL;
uint8_t *seq = NULL, *meta = NULL;
int64_t obu_size; int64_t obu_size;
int start_pos, type, temporal_id, spatial_id; int start_pos, type, temporal_id, spatial_id;
int ret, nb_seq = 0, seq_size, meta_size;
if (size <= 0) if (size <= 0)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
ret = avio_open_dyn_buf(&seq_pb);
if (ret < 0)
return ret;
ret = avio_open_dyn_buf(&meta_pb);
if (ret < 0)
goto fail;
while (size > 0) { while (size > 0) {
int len = parse_obu_header(buf, size, &obu_size, &start_pos, int len = parse_obu_header(buf, size, &obu_size, &start_pos,
&type, &temporal_id, &spatial_id); &type, &temporal_id, &spatial_id);
if (len < 0) if (len < 0) {
return len; ret = len;
goto fail;
}
switch (type) { switch (type) {
case AV1_OBU_SEQUENCE_HEADER: case AV1_OBU_SEQUENCE_HEADER:
nb_seq++;
if (!obu_size || nb_seq > 1) {
ret = AVERROR_INVALIDDATA;
goto fail;
}
avio_write(seq_pb, buf, len);
break;
case AV1_OBU_METADATA: case AV1_OBU_METADATA:
avio_write(pb, buf, len); if (!obu_size) {
ret = AVERROR_INVALIDDATA;
goto fail;
}
avio_write(meta_pb, buf, len);
break; break;
default: default:
break; break;
@@ -99,5 +122,24 @@ int ff_isom_write_av1c(AVIOContext *pb, const uint8_t *buf, int size)
buf += len; buf += len;
} }
return 0; seq_size = avio_close_dyn_buf(seq_pb, &seq);
if (!seq_size) {
ret = AVERROR_INVALIDDATA;
goto fail;
}
avio_write(pb, seq, seq_size);
meta_size = avio_close_dyn_buf(meta_pb, &meta);
if (meta_size)
avio_write(pb, meta, meta_size);
fail:
if (!seq)
avio_close_dyn_buf(seq_pb, &seq);
if (!meta)
avio_close_dyn_buf(meta_pb, &meta);
av_free(seq);
av_free(meta);
return ret;
} }