generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

H264 parser: enable header parsing/frame type detection for is_avc.

Browse Source 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
This commit is contained in:
Reimar Döffinger
2012-02-18 10:29:58 +01:00
parent d3f81a6700
commit 3fa6d20533
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
libavcodec/h264_parser.c
View File

@@ -166,12 +166,25 @@ static inline int parse_nal_units(AVCodecParserContext *s,
return 0; return 0;
for(;;) { for(;;) {
int src_length, dst_length, consumed; int src_length, dst_length, consumed, nalsize = 0;
if (h->is_avc) {
int i;
if (h->nal_length_size >= buf_end - buf) break;
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->s.avctx, AV_LOG_ERROR, "AVC: nal size %d\n", nalsize);
break;
}
src_length = nalsize;
} else {
buf = avpriv_mpv_find_start_code(buf, buf_end, &state); buf = avpriv_mpv_find_start_code(buf, buf_end, &state);
if(buf >= buf_end) if(buf >= buf_end)
break; break;
--buf; --buf;
src_length = buf_end - buf; src_length = buf_end - buf;
}
switch (state & 0x1f) { switch (state & 0x1f) {
case NAL_SLICE: case NAL_SLICE:
case NAL_IDR_SLICE: case NAL_IDR_SLICE:
@@ -267,7 +280,7 @@ 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 += consumed; buf += h->is_avc ? nalsize : consumed;
} }
if (q264) if (q264)
return 0; return 0;
@@ -316,7 +329,6 @@ static int h264_parse(AVCodecParserContext *s,
} }
} }
if(!h->is_avc){
parse_nal_units(s, avctx, buf, buf_size); parse_nal_units(s, avctx, buf, buf_size);
if (h->sei_cpb_removal_delay >= 0) { if (h->sei_cpb_removal_delay >= 0) {
@@ -332,7 +344,6 @@ static int h264_parse(AVCodecParserContext *s,
if (s->flags & PARSER_FLAG_ONCE) { if (s->flags & PARSER_FLAG_ONCE) {
s->flags &= PARSER_FLAG_COMPLETE_FRAMES; s->flags &= PARSER_FLAG_COMPLETE_FRAMES;
} }
}
*poutbuf = buf; *poutbuf = buf;
*poutbuf_size = buf_size; *poutbuf_size = buf_size;