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

Merge commit 'f8a4d5e970f32f8cc747f9fa7bd975ee4a060ea1'

Browse Source 
* commit 'f8a4d5e970f32f8cc747f9fa7bd975ee4a060ea1':
  h264_parser: K&R formatting cosmetics
  vorbis: return meaningful errors

Conflicts:
	libavcodec/h264_parser.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-06-08 10:50:24 +02:00
commit e2d4bcd7b8
2 changed files with 158 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

291
libavcodec/h264_parser.c
View File

@ -34,7 +34,8 @@
#include "internal.h" #include "internal.h"
static int h264_find_frame_end(H264Context *h, const uint8_t *buf, int buf_size) static int h264_find_frame_end(H264Context *h, const uint8_t *buf,
int buf_size)
{ {
int i, j; int i, j;
uint32_t state; uint32_t state;
@ -42,65 +43,74 @@ static int h264_find_frame_end(H264Context *h, const uint8_t *buf, int buf_size)
int next_avc= h->is_avc ? 0 : buf_size; int next_avc= h->is_avc ? 0 : buf_size;
// mb_addr= pc->mb_addr - 1; // mb_addr= pc->mb_addr - 1;
state= pc->state; state = pc->state;
if(state>13) if (state > 13)
state= 7; state = 7;
if(h->is_avc && !h->nal_length_size) if (h->is_avc && !h->nal_length_size)
av_log(h->avctx, AV_LOG_ERROR, "AVC-parser: nal length size invalid\n"); av_log(h->avctx, AV_LOG_ERROR, "AVC-parser: nal length size invalid\n");
for(i=0; i<buf_size; i++){ for (i = 0; i < buf_size; i++) {
if(i >= next_avc) { if (i >= next_avc) {
int nalsize = 0; int nalsize = 0;
i = next_avc; i = next_avc;
for(j = 0; j < h->nal_length_size; j++) for (j = 0; j < h->nal_length_size; j++)
nalsize = (nalsize << 8) | buf[i++]; nalsize = (nalsize << 8) | buf[i++];
if(nalsize <= 0 || nalsize > buf_size - i){ if (nalsize <= 0 || nalsize > buf_size - i) {
av_log(h->avctx, AV_LOG_ERROR, "AVC-parser: nal size %d remaining %d\n", nalsize, buf_size - i); av_log(h->avctx, AV_LOG_ERROR, "AVC-parser: nal size %d remaining %d\n", nalsize, buf_size - i);
return buf_size; return buf_size;
} }
next_avc= i + nalsize; next_avc = i + nalsize;
state= 5; state = 5;
} }
if(state==7){ if (state == 7) {
#if HAVE_FAST_UNALIGNED #if HAVE_FAST_UNALIGNED
/* we check i<buf_size instead of i+3/7 because its simpler /* we check i < buf_size instead of i + 3 / 7 because it is
* and there should be FF_INPUT_BUFFER_PADDING_SIZE bytes at the end * simpler and there must be FF_INPUT_BUFFER_PADDING_SIZE
*/ * bytes at the end.
*/
# if HAVE_FAST_64BIT # if HAVE_FAST_64BIT
while(i<next_avc && !((~*(const uint64_t*)(buf+i) & (*(const uint64_t*)(buf+i) - 0x0101010101010101ULL)) & 0x8080808080808080ULL)) while (i < next_avc &&
i+=8; !((~*(const uint64_t *)(buf + i) &
(*(const uint64_t *)(buf + i) - 0x0101010101010101ULL)) &
0x8080808080808080ULL))
i += 8;
# else # else
while(i<next_avc && !((~*(const uint32_t*)(buf+i) & (*(const uint32_t*)(buf+i) - 0x01010101U)) & 0x80808080U)) while (i < next_avc &&
i+=4; !((~*(const uint32_t *)(buf + i) &
(*(const uint32_t *)(buf + i) - 0x01010101U)) &
0x80808080U))
i += 4;
# endif # endif
#endif #endif
for(; i<next_avc; i++){ for (; i < next_avc; i++)
if(!buf[i]){ if (!buf[i]) {
state=2; state = 2;
break; break;
} }
} } else if (state <= 2) {
}else if(state<=2){ if (buf[i] == 1)
if(buf[i]==1) state^= 5; //2->7, 1->4, 0->5 state ^= 5; // 2->7, 1->4, 0->5
else if(buf[i]) state = 7; else if (buf[i])
else state>>=1; //2->1, 1->0, 0->0 state = 7;
}else if(state<=5){ else
int v= buf[i] & 0x1F; state >>= 1; // 2->1, 1->0, 0->0
if(v==6 || v==7 || v==8 || v==9){ } else if (state <= 5) {
if(pc->frame_start_found){ int v = buf[i] & 0x1F;
if (v == 6 || v == 7 || v == 8 || v == 9) {
if (pc->frame_start_found) {
i++; i++;
goto found; goto found;
} }
}else if(v==1 || v==2 || v==5){ } else if (v == 1 || v == 2 || v == 5) {
state+=8; state += 8;
continue; continue;
} }
state= 7; state = 7;
}else{ } else {
h->parse_history[h->parse_history_count++]= buf[i]; h->parse_history[h->parse_history_count++]= buf[i];
if(h->parse_history_count>3){ if (h->parse_history_count>3) {
unsigned int mb, last_mb= h->parse_last_mb; unsigned int mb, last_mb= h->parse_last_mb;
GetBitContext gb; GetBitContext gb;
@ -109,26 +119,26 @@ static int h264_find_frame_end(H264Context *h, const uint8_t *buf, int buf_size)
mb= get_ue_golomb_long(&gb); mb= get_ue_golomb_long(&gb);
last_mb= h->parse_last_mb; last_mb= h->parse_last_mb;
h->parse_last_mb= mb; h->parse_last_mb= mb;
if(pc->frame_start_found){ if (pc->frame_start_found) {
if(mb <= last_mb) if (mb <= last_mb)
goto found; goto found;
}else } else
pc->frame_start_found = 1; pc->frame_start_found = 1;
state= 7; state = 7;
} }
} }
} }
pc->state= state; pc->state = state;
if(h->is_avc) if (h->is_avc)
return next_avc; return next_avc;
return END_NOT_FOUND; return END_NOT_FOUND;
found: found:
pc->state=7; pc->state = 7;
pc->frame_start_found= 0; pc->frame_start_found = 0;
if(h->is_avc) if (h->is_avc)
return next_avc; return next_avc;
return i-(state&5) - 3*(state>7); return i - (state & 5) - 3 * (state > 7);
} }
/** /**
@ -143,7 +153,7 @@ static inline int parse_nal_units(AVCodecParserContext *s,
AVCodecContext *avctx, AVCodecContext *avctx,
const uint8_t *buf, int buf_size) const uint8_t *buf, int buf_size)
{ {
H264Context *h = s->priv_data; H264Context *h = s->priv_data;
const uint8_t *buf_end = buf + buf_size; const uint8_t *buf_end = buf + buf_size;
unsigned int pps_id; unsigned int pps_id;
unsigned int slice_type; unsigned int slice_type;
@ -153,20 +163,20 @@ static inline int parse_nal_units(AVCodecParserContext *s,
int field_poc[2]; int field_poc[2];
/* set some sane default values */ /* set some sane default values */
s->pict_type = AV_PICTURE_TYPE_I; s->pict_type = AV_PICTURE_TYPE_I;
s->key_frame = 0; s->key_frame = 0;
s->picture_structure = AV_PICTURE_STRUCTURE_UNKNOWN; s->picture_structure = AV_PICTURE_STRUCTURE_UNKNOWN;
h->avctx= avctx; h->avctx = avctx;
h->sei_recovery_frame_cnt = -1; h->sei_recovery_frame_cnt = -1;
h->sei_dpb_output_delay = 0; h->sei_dpb_output_delay = 0;
h->sei_cpb_removal_delay = -1; h->sei_cpb_removal_delay = -1;
h->sei_buffering_period_present = 0; h->sei_buffering_period_present = 0;
if (!buf_size) if (!buf_size)
return 0; return 0;
for(;;) { for (;;) {
int src_length, dst_length, consumed, nalsize = 0; int src_length, dst_length, consumed, nalsize = 0;
if (h->is_avc) { if (h->is_avc) {
int i; int i;
@ -181,7 +191,7 @@ static inline int parse_nal_units(AVCodecParserContext *s,
src_length = nalsize; src_length = nalsize;
} else { } else {
buf = avpriv_find_start_code(buf, buf_end, &state); buf = avpriv_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;
@ -194,12 +204,12 @@ static inline int parse_nal_units(AVCodecParserContext *s,
src_length = 20; src_length = 20;
break; break;
} }
ptr= ff_h264_decode_nal(h, buf, &dst_length, &consumed, src_length); ptr = ff_h264_decode_nal(h, buf, &dst_length, &consumed, src_length);
if (ptr==NULL || dst_length < 0) if (ptr == NULL || dst_length < 0)
break; break;
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:
ff_h264_decode_seq_parameter_set(h); ff_h264_decode_seq_parameter_set(h);
break; break;
@ -216,42 +226,45 @@ static inline int parse_nal_units(AVCodecParserContext *s,
h->prev_frame_num_offset = 0; h->prev_frame_num_offset = 0;
h->prev_poc_msb = h->prev_poc_msb =
h->prev_poc_lsb = 0; h->prev_poc_lsb = 0;
/* fall through */ /* fall through */
case NAL_SLICE: case NAL_SLICE:
get_ue_golomb_long(&h->gb); // skip first_mb_in_slice get_ue_golomb_long(&h->gb); // skip first_mb_in_slice
slice_type = get_ue_golomb_31(&h->gb); slice_type = get_ue_golomb_31(&h->gb);
s->pict_type = golomb_to_pict_type[slice_type % 5]; s->pict_type = golomb_to_pict_type[slice_type % 5];
if (h->sei_recovery_frame_cnt >= 0) { if (h->sei_recovery_frame_cnt >= 0) {
/* key frame, since recovery_frame_cnt is set */ /* key frame, since recovery_frame_cnt is set */
s->key_frame = 1; s->key_frame = 1;
} }
pps_id= get_ue_golomb(&h->gb); pps_id = get_ue_golomb(&h->gb);
if(pps_id>=MAX_PPS_COUNT) { if (pps_id >= MAX_PPS_COUNT) {
av_log(h->avctx, AV_LOG_ERROR, "pps_id out of range\n"); av_log(h->avctx, AV_LOG_ERROR,
"pps_id out of range\n");
return -1; return -1;
} }
if(!h->pps_buffers[pps_id]) { if (!h->pps_buffers[pps_id]) {
av_log(h->avctx, AV_LOG_ERROR, "non-existing PPS referenced\n"); av_log(h->avctx, AV_LOG_ERROR,
"non-existing PPS referenced\n");
return -1; return -1;
} }
h->pps= *h->pps_buffers[pps_id]; h->pps = *h->pps_buffers[pps_id];
if(!h->sps_buffers[h->pps.sps_id]) { if (!h->sps_buffers[h->pps.sps_id]) {
av_log(h->avctx, AV_LOG_ERROR, "non-existing SPS referenced\n"); av_log(h->avctx, AV_LOG_ERROR,
"non-existing SPS referenced\n");
return -1; return -1;
} }
h->sps = *h->sps_buffers[h->pps.sps_id]; h->sps = *h->sps_buffers[h->pps.sps_id];
h->frame_num = get_bits(&h->gb, h->sps.log2_max_frame_num); h->frame_num = get_bits(&h->gb, h->sps.log2_max_frame_num);
avctx->profile = ff_h264_get_profile(&h->sps); avctx->profile = ff_h264_get_profile(&h->sps);
avctx->level = h->sps.level_idc; avctx->level = h->sps.level_idc;
if(h->sps.frame_mbs_only_flag){ if (h->sps.frame_mbs_only_flag) {
h->picture_structure= PICT_FRAME; h->picture_structure = PICT_FRAME;
}else{ } else {
if(get_bits1(&h->gb)) { //field_pic_flag if (get_bits1(&h->gb)) { // field_pic_flag
h->picture_structure= PICT_TOP_FIELD + get_bits1(&h->gb); //bottom_field_flag h->picture_structure = PICT_TOP_FIELD + get_bits1(&h->gb); // bottom_field_flag
} else { } else {
h->picture_structure= PICT_FRAME; h->picture_structure = PICT_FRAME;
} }
} }
@ -260,43 +273,46 @@ static inline int parse_nal_units(AVCodecParserContext *s,
if (h->sps.poc_type == 0) { if (h->sps.poc_type == 0) {
h->poc_lsb = get_bits(&h->gb, h->sps.log2_max_poc_lsb); h->poc_lsb = get_bits(&h->gb, h->sps.log2_max_poc_lsb);
if (h->pps.pic_order_present == 1 && h->picture_structure == PICT_FRAME) if (h->pps.pic_order_present == 1 &&
h->picture_structure == PICT_FRAME)
h->delta_poc_bottom = get_se_golomb(&h->gb); h->delta_poc_bottom = get_se_golomb(&h->gb);
} }
if (h->sps.poc_type == 1 && !h->sps.delta_pic_order_always_zero_flag) { if (h->sps.poc_type == 1 &&
!h->sps.delta_pic_order_always_zero_flag) {
h->delta_poc[0] = get_se_golomb(&h->gb); h->delta_poc[0] = get_se_golomb(&h->gb);
if (h->pps.pic_order_present == 1 && h->picture_structure == PICT_FRAME) if (h->pps.pic_order_present == 1 &&
h->picture_structure == PICT_FRAME)
h->delta_poc[1] = get_se_golomb(&h->gb); h->delta_poc[1] = get_se_golomb(&h->gb);
} }
ff_init_poc(h, field_poc, NULL); ff_init_poc(h, field_poc, NULL);
if(h->sps.pic_struct_present_flag) { if (h->sps.pic_struct_present_flag) {
switch (h->sei_pic_struct) { switch (h->sei_pic_struct) {
case SEI_PIC_STRUCT_TOP_FIELD: case SEI_PIC_STRUCT_TOP_FIELD:
case SEI_PIC_STRUCT_BOTTOM_FIELD: case SEI_PIC_STRUCT_BOTTOM_FIELD:
s->repeat_pict = 0; s->repeat_pict = 0;
break; break;
case SEI_PIC_STRUCT_FRAME: case SEI_PIC_STRUCT_FRAME:
case SEI_PIC_STRUCT_TOP_BOTTOM: case SEI_PIC_STRUCT_TOP_BOTTOM:
case SEI_PIC_STRUCT_BOTTOM_TOP: case SEI_PIC_STRUCT_BOTTOM_TOP:
s->repeat_pict = 1; s->repeat_pict = 1;
break; break;
case SEI_PIC_STRUCT_TOP_BOTTOM_TOP: case SEI_PIC_STRUCT_TOP_BOTTOM_TOP:
case SEI_PIC_STRUCT_BOTTOM_TOP_BOTTOM: case SEI_PIC_STRUCT_BOTTOM_TOP_BOTTOM:
s->repeat_pict = 2; s->repeat_pict = 2;
break; break;
case SEI_PIC_STRUCT_FRAME_DOUBLING: case SEI_PIC_STRUCT_FRAME_DOUBLING:
s->repeat_pict = 3; s->repeat_pict = 3;
break; break;
case SEI_PIC_STRUCT_FRAME_TRIPLING: case SEI_PIC_STRUCT_FRAME_TRIPLING:
s->repeat_pict = 5; s->repeat_pict = 5;
break; break;
default: default:
s->repeat_pict = h->picture_structure == PICT_FRAME ? 1 : 0; s->repeat_pict = h->picture_structure == PICT_FRAME ? 1 : 0;
break; break;
} }
} else { } else {
s->repeat_pict = h->picture_structure == PICT_FRAME ? 1 : 0; s->repeat_pict = h->picture_structure == PICT_FRAME ? 1 : 0;
@ -306,17 +322,17 @@ static inline int parse_nal_units(AVCodecParserContext *s,
s->picture_structure = AV_PICTURE_STRUCTURE_FRAME; s->picture_structure = AV_PICTURE_STRUCTURE_FRAME;
if (h->sps.pic_struct_present_flag) { if (h->sps.pic_struct_present_flag) {
switch (h->sei_pic_struct) { switch (h->sei_pic_struct) {
case SEI_PIC_STRUCT_TOP_BOTTOM: case SEI_PIC_STRUCT_TOP_BOTTOM:
case SEI_PIC_STRUCT_TOP_BOTTOM_TOP: case SEI_PIC_STRUCT_TOP_BOTTOM_TOP:
s->field_order = AV_FIELD_TT; s->field_order = AV_FIELD_TT;
break; break;
case SEI_PIC_STRUCT_BOTTOM_TOP: case SEI_PIC_STRUCT_BOTTOM_TOP:
case SEI_PIC_STRUCT_BOTTOM_TOP_BOTTOM: case SEI_PIC_STRUCT_BOTTOM_TOP_BOTTOM:
s->field_order = AV_FIELD_BB; s->field_order = AV_FIELD_BB;
break; break;
default: default:
s->field_order = AV_FIELD_PROGRESSIVE; s->field_order = AV_FIELD_PROGRESSIVE;
break; break;
} }
} else { } else {
if (field_poc[0] < field_poc[1]) if (field_poc[0] < field_poc[1])
@ -350,7 +366,7 @@ static int h264_parse(AVCodecParserContext *s,
const uint8_t **poutbuf, int *poutbuf_size, const uint8_t **poutbuf, int *poutbuf_size,
const uint8_t *buf, int buf_size) const uint8_t *buf, int buf_size)
{ {
H264Context *h = s->priv_data; H264Context *h = s->priv_data;
ParseContext *pc = &h->parse_context; ParseContext *pc = &h->parse_context;
int next; int next;
@ -368,19 +384,19 @@ static int h264_parse(AVCodecParserContext *s,
} }
} }
if(s->flags & PARSER_FLAG_COMPLETE_FRAMES){ if (s->flags & PARSER_FLAG_COMPLETE_FRAMES) {
next= buf_size; next = buf_size;
}else{ } else {
next = h264_find_frame_end(h, buf, buf_size); next = h264_find_frame_end(h, buf, buf_size);
if (ff_combine_frame(pc, next, &buf, &buf_size) < 0) { if (ff_combine_frame(pc, next, &buf, &buf_size) < 0) {
*poutbuf = NULL; *poutbuf = NULL;
*poutbuf_size = 0; *poutbuf_size = 0;
return buf_size; return buf_size;
} }
if(next<0 && next != END_NOT_FOUND){ if (next < 0 && next != END_NOT_FOUND) {
av_assert1(pc->last_index + next >= 0 ); av_assert1(pc->last_index + next >= 0);
h264_find_frame_end(h, &pc->buffer[pc->last_index + next], -next); // update state h264_find_frame_end(h, &pc->buffer[pc->last_index + next], -next); // update state
} }
} }
@ -401,7 +417,7 @@ static int h264_parse(AVCodecParserContext *s,
s->flags &= PARSER_FLAG_COMPLETE_FRAMES; s->flags &= PARSER_FLAG_COMPLETE_FRAMES;
} }
*poutbuf = buf; *poutbuf = buf;
*poutbuf_size = buf_size; *poutbuf_size = buf_size;
return next; return next;
} }
@ -411,28 +427,33 @@ static int h264_split(AVCodecContext *avctx,
{ {
int i; int i;
uint32_t state = -1; uint32_t state = -1;
int has_sps= 0; int has_sps = 0;
for(i=0; i<=buf_size; i++){ for (i = 0; i <= buf_size; i++) {
if((state&0xFFFFFF1F) == 0x107) if ((state & 0xFFFFFF1F) == 0x107)
has_sps=1; has_sps = 1;
/* if((state&0xFFFFFF1F) == 0x101 || (state&0xFFFFFF1F) == 0x102 || (state&0xFFFFFF1F) == 0x105){ /* if ((state&0xFFFFFF1F) == 0x101 ||
}*/ * (state&0xFFFFFF1F) == 0x102 ||
if((state&0xFFFFFF00) == 0x100 && (state&0xFFFFFF1F) != 0x107 && (state&0xFFFFFF1F) != 0x108 && (state&0xFFFFFF1F) != 0x109){ * (state&0xFFFFFF1F) == 0x105) {
if(has_sps){ * }
while(i>4 && buf[i-5]==0) i--; */
return i-4; if ((state & 0xFFFFFF00) == 0x100 && (state & 0xFFFFFF1F) != 0x107 &&
(state & 0xFFFFFF1F) != 0x108 && (state & 0xFFFFFF1F) != 0x109) {
if (has_sps) {
while (i > 4 && buf[i - 5] == 0)
i--;
return i - 4;
} }
} }
if (i<buf_size) if (i < buf_size)
state= (state<<8) | buf[i]; state = (state << 8) | buf[i];
} }
return 0; return 0;
} }
static void close(AVCodecParserContext *s) static void close(AVCodecParserContext *s)
{ {
H264Context *h = s->priv_data; H264Context *h = s->priv_data;
ParseContext *pc = &h->parse_context; ParseContext *pc = &h->parse_context;
av_free(pc->buffer); av_free(pc->buffer);
@ -442,7 +463,7 @@ static void close(AVCodecParserContext *s)
static av_cold int init(AVCodecParserContext *s) static av_cold int init(AVCodecParserContext *s)
{ {
H264Context *h = s->priv_data; H264Context *h = s->priv_data;
h->thread_context[0] = h; h->thread_context[0] = h;
h->slice_context_count = 1; h->slice_context_count = 1;
return 0; return 0;
} }

4
libavcodec/vorbisdec.c
View File

@ -1386,7 +1386,7 @@ static av_always_inline int vorbis_residue_decode_internal(vorbis_context *vc,
if (max_output > ch_left * vlen) { if (max_output > ch_left * vlen) {
av_log(vc->avctx, AV_LOG_ERROR, "Insufficient output buffer\n"); av_log(vc->avctx, AV_LOG_ERROR, "Insufficient output buffer\n");
return -1; return AVERROR_INVALIDDATA;
} }
av_dlog(NULL, " residue type 0/1/2 decode begin, ch: %d cpc %d \n", ch, c_p_c); av_dlog(NULL, " residue type 0/1/2 decode begin, ch: %d cpc %d \n", ch, c_p_c);
@ -1637,7 +1637,7 @@ static int vorbis_parse_audio_packet(vorbis_context *vc, float **floor_ptr)
residue = &vc->residues[mapping->submap_residue[i]]; residue = &vc->residues[mapping->submap_residue[i]];
if (ch_left < ch) { if (ch_left < ch) {
av_log(vc->avctx, AV_LOG_ERROR, "Too many channels in vorbis_floor_decode.\n"); av_log(vc->avctx, AV_LOG_ERROR, "Too many channels in vorbis_floor_decode.\n");
return -1; return AVERROR_INVALIDDATA;
} }
if (ch) { if (ch) {
ret = vorbis_residue_decode(vc, residue, ch, do_not_decode, ch_res_ptr, vlen, ch_left); ret = vorbis_residue_decode(vc, residue, ch, do_not_decode, ch_res_ptr, vlen, ch_left);