xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2024-11-24 20:19:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

hevc: skip invalid/ignored NALUs when splitting the packet

Browse Source 
There is no need to wait until actually decoding the NALU. This will
allow to get rid of the second hls_nal_unit() call later.
This commit is contained in:
Anton Khirnov 2015-07-09 18:01:08 +02:00
parent b11acd5732
commit d7bebe4805
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libavcodec/hevc.c
View File

@ -2503,13 +2503,7 @@ static int decode_nal_unit(HEVCContext *s, const HEVCNAL *nal)
if (ret < 0)
return ret;
ret = hls_nal_unit(s);
if (ret < 0) {
av_log(s->avctx, AV_LOG_ERROR, "Invalid NAL unit %d, skipping.\n",
s->nal_unit_type);
goto fail;
} else if (!ret)
return 0;
hls_nal_unit(s);
switch (s->nal_unit_type) {
case NAL_VPS:
@ -2709,12 +2703,22 @@ static int decode_nal_units(HEVCContext *s, const uint8_t *buf, int length)
ret = init_get_bits8(&s->HEVClc.gb, nal->data, nal->size);
if (ret < 0)
goto fail;
hls_nal_unit(s);
ret = hls_nal_unit(s);
if (ret <= 0) {
if (ret < 0) {
av_log(s->avctx, AV_LOG_ERROR, "Invalid NAL unit %d, skipping.\n",
s->nal_unit_type);
}
s->nb_nals--;
goto skip_nal;
}
if (s->nal_unit_type == NAL_EOB_NUT ||
s->nal_unit_type == NAL_EOS_NUT)
s->eos = 1;
skip_nal:
buf += consumed;
length -= consumed;
}