diff options
| author | James Almer <jamrial@gmail.com> | 2020-08-12 14:46:35 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2020-08-20 13:50:01 -0300 |
| commit | 1e41a9be3402b1cd76ae575488d141a8a0c06d81 (patch) | |
| tree | dcb3e14c31986d3a173f1b3bb9a357c7a1b2a3fb | |
| parent | a4d28ea030b210eefaaf144dcdbae4c330c69c4d (diff) | |
| download | ffmpeg-1e41a9be3402b1cd76ae575488d141a8a0c06d81.tar.gz | |
avcodec/h2645_parse: skip empty NAL units earlier
No point in trying to parse nonexistent header bits.
Signed-off-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | libavcodec/h2645_parse.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/libavcodec/h2645_parse.c b/libavcodec/h2645_parse.c index a7cdf76e87..7137af2ee4 100644 --- a/libavcodec/h2645_parse.c +++ b/libavcodec/h2645_parse.c @@ -485,8 +485,6 @@ int ff_h2645_packet_split(H2645Packet *pkt, const uint8_t *buf, int length, "NALFF: Consumed only %d bytes instead of %d\n", consumed, extract_length); - pkt->nb_nals++; - bytestream2_skip(&bc, consumed); /* see commit 3566042a0 */ @@ -496,6 +494,9 @@ int ff_h2645_packet_split(H2645Packet *pkt, const uint8_t *buf, int length, nal->size_bits = get_bit_length(nal, skip_trailing_zeros); + if (nal->size <= 0 || nal->size_bits <= 0) + continue; + ret = init_get_bits(&nal->gb, nal->data, nal->size_bits); if (ret < 0) return ret; @@ -504,13 +505,13 @@ int ff_h2645_packet_split(H2645Packet *pkt, const uint8_t *buf, int length, ret = hevc_parse_nal_header(nal, logctx); else ret = h264_parse_nal_header(nal, logctx); - if (ret < 0 || nal->size <= 0 || nal->size_bits <= 0) { - if (ret < 0) { - av_log(logctx, AV_LOG_WARNING, "Invalid NAL unit %d, skipping.\n", - nal->type); - } - pkt->nb_nals--; + if (ret < 0) { + av_log(logctx, AV_LOG_WARNING, "Invalid NAL unit %d, skipping.\n", + nal->type); + continue; } + + pkt->nb_nals++; } return 0; |