RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-25 08:43:16 +00:00
Code Issues Projects Releases Wiki Activity

avcodec/h264_parser: rewrite the parse_nal_units() loop logic based on h264.c

Browse Source 
Fixes Ticket4011

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 69a9a90d2e)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-10-27 04:30:11 +01:00
parent 5405ba7b63
commit 9a641b909c
1 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
libavcodec/h264_parser.c
View File

@ -202,10 +202,10 @@ static int scan_mmco_reset(AVCodecParserContext *s)
*/ */
static inline int parse_nal_units(AVCodecParserContext *s, static inline int parse_nal_units(AVCodecParserContext *s,
AVCodecContext *avctx, AVCodecContext *avctx,
const uint8_t *buf, int buf_size) const uint8_t * const buf, int buf_size)
{ {
H264Context *h = s->priv_data; H264Context *h = s->priv_data;
const uint8_t *buf_end = buf + buf_size; int buf_index, next_avc;
unsigned int pps_id; unsigned int pps_id;
unsigned int slice_type; unsigned int slice_type;
int state = -1, got_reset = 0; int state = -1, got_reset = 0;
@ -225,26 +225,26 @@ static inline int parse_nal_units(AVCodecParserContext *s,
if (!buf_size) if (!buf_size)
return 0; return 0;
buf_index = 0;
next_avc = h->is_avc ? 0 : buf_size;
for (;;) { for (;;) {
int src_length, dst_length, consumed, nalsize = 0; int src_length, dst_length, consumed, nalsize = 0;
if (h->is_avc) {
int i; if (buf_index >= next_avc) {
if (h->nal_length_size >= buf_end - buf) break; nalsize = get_avc_nalsize(h, buf, buf_size, &buf_index);
nalsize = 0; if (nalsize < 0)
for (i = 0; i < h->nal_length_size; i++)
nalsize = (nalsize << 8) | *buf++;
if (nalsize <= 0 || nalsize > buf_end - buf) {
av_log(h->avctx, AV_LOG_ERROR, "AVC: nal size %d\n", nalsize);
break; break;
} next_avc = buf_index + nalsize;
src_length = nalsize;
} else { } else {
buf = avpriv_find_start_code(buf, buf_end, &state); buf_index = find_start_code(buf, buf_size, buf_index, next_avc);
if (buf >= buf_end) if (buf_index >= buf_size)
break; break;
--buf; if (buf_index >= next_avc)
src_length = buf_end - buf; continue;
} }
src_length = next_avc - buf_index;
state = buf[buf_index];
switch (state & 0x1f) { switch (state & 0x1f) {
case NAL_SLICE: case NAL_SLICE:
case NAL_IDR_SLICE: case NAL_IDR_SLICE:
@ -261,10 +261,13 @@ static inline int parse_nal_units(AVCodecParserContext *s,
} }
break; break;
} }
ptr = ff_h264_decode_nal(h, buf, &dst_length, &consumed, src_length); ptr = ff_h264_decode_nal(h, buf + buf_index, &dst_length,
&consumed, src_length);
if (!ptr || dst_length < 0) if (!ptr || dst_length < 0)
break; break;
buf_index += consumed;
init_get_bits(&h->gb, ptr, 8 * dst_length); init_get_bits(&h->gb, ptr, 8 * dst_length);
switch (h->nal_unit_type) { switch (h->nal_unit_type) {
case NAL_SPS: case NAL_SPS:
@ -439,7 +442,6 @@ static inline int parse_nal_units(AVCodecParserContext *s,
return 0; /* no need to evaluate the rest */ return 0; /* no need to evaluate the rest */
} }
buf += h->is_avc ? nalsize : consumed;
} }
if (q264) if (q264)
return 0; return 0;