RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
James Almer 2020-08-12 14:46:35 -03:00
parent a4d28ea030
commit 1e41a9be34
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libavcodec/h2645_parse.c
View File

@ -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", "NALFF: Consumed only %d bytes instead of %d\n",
consumed, extract_length); consumed, extract_length);
pkt->nb_nals++;
bytestream2_skip(&bc, consumed); bytestream2_skip(&bc, consumed);
/* see commit 3566042a0 */ /* 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); 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); ret = init_get_bits(&nal->gb, nal->data, nal->size_bits);
if (ret < 0) if (ret < 0)
return ret; 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); ret = hevc_parse_nal_header(nal, logctx);
else else
ret = h264_parse_nal_header(nal, logctx); ret = h264_parse_nal_header(nal, logctx);
if (ret < 0 || nal->size <= 0 || nal->size_bits <= 0) { if (ret < 0) {
if (ret < 0) { av_log(logctx, AV_LOG_WARNING, "Invalid NAL unit %d, skipping.\n",
av_log(logctx, AV_LOG_WARNING, "Invalid NAL unit %d, skipping.\n", nal->type);
nal->type); continue;
}
pkt->nb_nals--;
} }
pkt->nb_nals++;
} }
return 0; return 0;