falkTX
/
FFmpeg
mirror of https://github.com/falkTX/FFmpeg.git
1
0
Fork 0
Code Issues 0 Releases 338 Wiki Activity
Browse Source

h264_parser: K&R formatting cosmetics

tags/n2.0
Luca Barbato 12 years ago
parent
92b3caa108
commit
f8a4d5e970
1 changed files with 151 additions and 130 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +151
    -130
      libavcodec/h264_parser.c

+ 151
- 130
libavcodec/h264_parser.c View File

@@ -34,68 +34,78 @@
#include <assert.h> #include <assert.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; int i;
uint32_t state; uint32_t state;
ParseContext *pc = &h->parse_context; ParseContext *pc = &h->parse_context;
// mb_addr= pc->mb_addr - 1; // mb_addr= pc->mb_addr - 1;
state= pc->state;
if(state>13)
state= 7;
state = pc->state;
if (state > 13)
state = 7;


for(i=0; i<buf_size; i++){
if(state==7){
for (i = 0; i < buf_size; i++) {
if (state == 7) {
#if HAVE_FAST_UNALIGNED #if HAVE_FAST_UNALIGNED
/* we check i<buf_size instead of i+3/7 because its simpler
* and there should be FF_INPUT_BUFFER_PADDING_SIZE bytes at the end
*/
# if HAVE_FAST_64BIT
while(i<buf_size && !((~*(const uint64_t*)(buf+i) & (*(const uint64_t*)(buf+i) - 0x0101010101010101ULL)) & 0x8080808080808080ULL))
i+=8;
# else
while(i<buf_size && !((~*(const uint32_t*)(buf+i) & (*(const uint32_t*)(buf+i) - 0x01010101U)) & 0x80808080U))
i+=4;
# endif
/* we check i < buf_size instead of i + 3 / 7 because it is
* simpler and there must be FF_INPUT_BUFFER_PADDING_SIZE
* bytes at the end.
*/
#if HAVE_FAST_64BIT
while (i < buf_size &&
!((~*(const uint64_t *)(buf + i) &
(*(const uint64_t *)(buf + i) - 0x0101010101010101ULL)) &
0x8080808080808080ULL))
i += 8;
#else
while (i < buf_size &&
!((~*(const uint32_t *)(buf + i) &
(*(const uint32_t *)(buf + i) - 0x01010101U)) &
0x80808080U))
i += 4;
#endif
#endif #endif
for(; i<buf_size; i++){
if(!buf[i]){
state=2;
for (; i < buf_size; i++)
if (!buf[i]) {
state = 2;
break; break;
} }
}
}else if(state<=2){
if(buf[i]==1) state^= 5; //2->7, 1->4, 0->5
else if(buf[i]) state = 7;
else state>>=1; //2->1, 1->0, 0->0
}else if(state<=5){
int v= buf[i] & 0x1F;
if(v==6 || v==7 || v==8 || v==9){
if(pc->frame_start_found){
} else if (state <= 2) {
if (buf[i] == 1)
state ^= 5; // 2->7, 1->4, 0->5
else if (buf[i])
state = 7;
else
state >>= 1; // 2->1, 1->0, 0->0
} else if (state <= 5) {
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){
if(pc->frame_start_found){
state+=8;
} else if (v == 1 || v == 2 || v == 5) {
if (pc->frame_start_found) {
state += 8;
continue; continue;
}else
} else
pc->frame_start_found = 1; pc->frame_start_found = 1;
} }
state= 7;
}else{
if(buf[i] & 0x80)
state = 7;
} else {
if (buf[i] & 0x80)
goto found; goto found;
state= 7;
state = 7;
} }
} }
pc->state= state;
pc->state = state;
return END_NOT_FOUND; return END_NOT_FOUND;


found: found:
pc->state=7;
pc->frame_start_found= 0;
return i-(state&5);
pc->state = 7;
pc->frame_start_found = 0;
return i - (state & 5);
} }


/** /**
@@ -110,7 +120,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;
@@ -119,23 +129,23 @@ 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->key_frame = 0;
s->pict_type = AV_PICTURE_TYPE_I;
s->key_frame = 0;
s->picture_structure = AV_PICTURE_STRUCTURE_UNKNOWN; s->picture_structure = AV_PICTURE_STRUCTURE_UNKNOWN;


h->avctx= avctx;
h->sei_recovery_frame_cnt = -1;
h->sei_dpb_output_delay = 0;
h->avctx = avctx;
h->sei_recovery_frame_cnt = -1;
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; int src_length, dst_length, consumed;
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;
@@ -147,12 +157,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);
if (ptr==NULL || dst_length < 0)
ptr = ff_h264_decode_nal(h, buf, &dst_length, &consumed, src_length);
if (ptr == NULL || dst_length < 0)
break; break;


init_get_bits(&h->gb, ptr, 8*dst_length);
switch(h->nal_unit_type) {
init_get_bits(&h->gb, ptr, 8 * dst_length);
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;
@@ -169,42 +179,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(&h->gb); // skip first_mb_in_slice get_ue_golomb(&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);
if(pps_id>=MAX_PPS_COUNT) {
av_log(h->avctx, AV_LOG_ERROR, "pps_id out of range\n");
pps_id = get_ue_golomb(&h->gb);
if (pps_id >= MAX_PPS_COUNT) {
av_log(h->avctx, AV_LOG_ERROR,
"pps_id out of range\n");
return -1; return -1;
} }
if(!h->pps_buffers[pps_id]) {
av_log(h->avctx, AV_LOG_ERROR, "non-existing PPS referenced\n");
if (!h->pps_buffers[pps_id]) {
av_log(h->avctx, AV_LOG_ERROR,
"non-existing PPS referenced\n");
return -1; return -1;
} }
h->pps= *h->pps_buffers[pps_id];
if(!h->sps_buffers[h->pps.sps_id]) {
av_log(h->avctx, AV_LOG_ERROR, "non-existing SPS referenced\n");
h->pps = *h->pps_buffers[pps_id];
if (!h->sps_buffers[h->pps.sps_id]) {
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){
h->picture_structure= PICT_FRAME;
}else{
if(get_bits1(&h->gb)) { //field_pic_flag
h->picture_structure= PICT_TOP_FIELD + get_bits1(&h->gb); //bottom_field_flag
if (h->sps.frame_mbs_only_flag) {
h->picture_structure = PICT_FRAME;
} else {
if (get_bits1(&h->gb)) { // field_pic_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;
} }
} }


@@ -213,43 +226,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_BOTTOM_FIELD:
s->repeat_pict = 0;
break;
case SEI_PIC_STRUCT_FRAME:
case SEI_PIC_STRUCT_TOP_BOTTOM:
case SEI_PIC_STRUCT_BOTTOM_TOP:
s->repeat_pict = 1;
break;
case SEI_PIC_STRUCT_TOP_BOTTOM_TOP:
case SEI_PIC_STRUCT_BOTTOM_TOP_BOTTOM:
s->repeat_pict = 2;
break;
case SEI_PIC_STRUCT_FRAME_DOUBLING:
s->repeat_pict = 3;
break;
case SEI_PIC_STRUCT_FRAME_TRIPLING:
s->repeat_pict = 5;
break;
default:
s->repeat_pict = h->picture_structure == PICT_FRAME ? 1 : 0;
break;
case SEI_PIC_STRUCT_TOP_FIELD:
case SEI_PIC_STRUCT_BOTTOM_FIELD:
s->repeat_pict = 0;
break;
case SEI_PIC_STRUCT_FRAME:
case SEI_PIC_STRUCT_TOP_BOTTOM:
case SEI_PIC_STRUCT_BOTTOM_TOP:
s->repeat_pict = 1;
break;
case SEI_PIC_STRUCT_TOP_BOTTOM_TOP:
case SEI_PIC_STRUCT_BOTTOM_TOP_BOTTOM:
s->repeat_pict = 2;
break;
case SEI_PIC_STRUCT_FRAME_DOUBLING:
s->repeat_pict = 3;
break;
case SEI_PIC_STRUCT_FRAME_TRIPLING:
s->repeat_pict = 5;
break;
default:
s->repeat_pict = h->picture_structure == PICT_FRAME ? 1 : 0;
break;
} }
} else { } else {
s->repeat_pict = h->picture_structure == PICT_FRAME ? 1 : 0; s->repeat_pict = h->picture_structure == PICT_FRAME ? 1 : 0;
@@ -259,17 +275,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_TOP:
s->field_order = AV_FIELD_TT;
break;
case SEI_PIC_STRUCT_BOTTOM_TOP:
case SEI_PIC_STRUCT_BOTTOM_TOP_BOTTOM:
s->field_order = AV_FIELD_BB;
break;
default:
s->field_order = AV_FIELD_PROGRESSIVE;
break;
case SEI_PIC_STRUCT_TOP_BOTTOM:
case SEI_PIC_STRUCT_TOP_BOTTOM_TOP:
s->field_order = AV_FIELD_TT;
break;
case SEI_PIC_STRUCT_BOTTOM_TOP:
case SEI_PIC_STRUCT_BOTTOM_TOP_BOTTOM:
s->field_order = AV_FIELD_BB;
break;
default:
s->field_order = AV_FIELD_PROGRESSIVE;
break;
} }
} else { } else {
if (field_poc[0] < field_poc[1]) if (field_poc[0] < field_poc[1])
@@ -301,7 +317,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;


@@ -320,19 +336,19 @@ static int h264_parse(AVCodecParserContext *s,
} }
} }


if(s->flags & PARSER_FLAG_COMPLETE_FRAMES){
next= buf_size;
}else{
if (s->flags & PARSER_FLAG_COMPLETE_FRAMES) {
next = buf_size;
} 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){
assert(pc->last_index + next >= 0 );
if (next < 0 && next != END_NOT_FOUND) {
assert(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
} }
} }
@@ -353,7 +369,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;
} }
@@ -363,28 +379,33 @@ static int h264_split(AVCodecContext *avctx,
{ {
int i; int i;
uint32_t state = -1; uint32_t state = -1;
int has_sps= 0;

for(i=0; i<=buf_size; i++){
if((state&0xFFFFFF1F) == 0x107)
has_sps=1;
/* if((state&0xFFFFFF1F) == 0x101 || (state&0xFFFFFF1F) == 0x102 || (state&0xFFFFFF1F) == 0x105){
}*/
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;
int has_sps = 0;

for (i = 0; i <= buf_size; i++) {
if ((state & 0xFFFFFF1F) == 0x107)
has_sps = 1;
/* if((state&0xFFFFFF1F) == 0x101 ||
* (state&0xFFFFFF1F) == 0x102 ||
* (state&0xFFFFFF1F) == 0x105) {
* }
*/
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)
state= (state<<8) | buf[i];
if (i < buf_size)
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);
@@ -394,7 +415,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;
} }


Write Preview
Loading…
Cancel
Save