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

avformat/hevc: Defer initializations in ff_isom_write_hvcc()

Browse Source 
Saves initialization of an HEVCDecoderConfigurationRecord when
the data is already in ISOBMFF-format or if it is plainly invalid.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2020-01-23 04:10:48 +01:00
parent 297d5a110b
commit 1884d887ba
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libavformat/hevc.c
View File

@ -1068,29 +1068,27 @@ int ff_hevc_annexb2mp4_buf(const uint8_t *buf_in, uint8_t **buf_out,
int ff_isom_write_hvcc(AVIOContext *pb, const uint8_t *data, int ff_isom_write_hvcc(AVIOContext *pb, const uint8_t *data,
int size, int ps_array_completeness) int size, int ps_array_completeness)
{ {
int ret = 0;
uint8_t *buf, *end, *start = NULL;
HEVCDecoderConfigurationRecord hvcc; HEVCDecoderConfigurationRecord hvcc;
uint8_t *buf, *end, *start;
hvcc_init(&hvcc); int ret;
if (size < 6) { if (size < 6) {
/* We can't write a valid hvcC from the provided data */ /* We can't write a valid hvcC from the provided data */
ret = AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
goto end;
} else if (*data == 1) { } else if (*data == 1) {
/* Data is already hvcC-formatted */ /* Data is already hvcC-formatted */
avio_write(pb, data, size); avio_write(pb, data, size);
goto end; return 0;
} else if (!(AV_RB24(data) == 1 || AV_RB32(data) == 1)) { } else if (!(AV_RB24(data) == 1 || AV_RB32(data) == 1)) {
/* Not a valid Annex B start code prefix */ /* Not a valid Annex B start code prefix */
ret = AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
goto end;
} }
ret = ff_avc_parse_nal_units_buf(data, &start, &size); ret = ff_avc_parse_nal_units_buf(data, &start, &size);
if (ret < 0) if (ret < 0)
goto end; return ret;
hvcc_init(&hvcc);
buf = start; buf = start;
end = start + size; end = start + size;