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.
---
libavcodec/hevc.c | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c
index be9df4e..ed97d9d 100644
--- a/libavcodec/hevc.c
+++ b/libavcodec/hevc.c
@@ -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;
}
--
2.0.0
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel
