Skip to content

F
ffmpeg
Commit f8a4d5e9 authored by Luca Barbato's avatar Luca Barbato
Browse files
Options

h264_parser: K&R formatting cosmetics

parent 92b3caa1
Show whitespace changes
Inline Side-by-side
Showing with 103 additions and 82 deletions
libavcodec/h264_parser.c
View file @ f8a4d5e9
...@@ -34,68 +34,78 @@ ...@@ -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; state = pc->state;
if(state>13) if (state > 13)
state= 7; state = 7;
for(i=0; i<buf_size; i++){ for (i = 0; i < buf_size; i++) {
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<buf_size && !((~*(const uint64_t*)(buf+i) & (*(const uint64_t*)(buf+i) - 0x0101010101010101ULL)) & 0x8080808080808080ULL)) while (i < buf_size &&
i+=8; !((~*(const uint64_t *)(buf + i) &
# else (*(const uint64_t *)(buf + i) - 0x0101010101010101ULL)) &
while(i<buf_size && !((~*(const uint32_t*)(buf+i) & (*(const uint32_t*)(buf+i) - 0x01010101U)) & 0x80808080U)) 0x8080808080808080ULL))
i+=4; i += 8;
# endif #else
while (i < buf_size &&
!((~*(const uint32_t *)(buf + i) &
(*(const uint32_t *)(buf + i) - 0x01010101U)) &
0x80808080U))
i += 4;
#endif #endif
for(; i<buf_size; i++){ #endif
if(!buf[i]){ for (; i < buf_size; i++)
state=2; if (!buf[i]) {
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) {
if(pc->frame_start_found){ if (pc->frame_start_found) {
state+=8; state += 8;
continue; continue;
}else } else
pc->frame_start_found = 1; pc->frame_start_found = 1;
} }
state= 7; state = 7;
}else{ } else {
if(buf[i] & 0x80) 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->state = 7;
pc->frame_start_found= 0; pc->frame_start_found = 0;
return i-(state&5); return i - (state & 5);
} }
/** /**
...@@ -123,7 +133,7 @@ static inline int parse_nal_units(AVCodecParserContext *s, ...@@ -123,7 +133,7 @@ static inline int parse_nal_units(AVCodecParserContext *s,
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;
...@@ -132,10 +142,10 @@ static inline int parse_nal_units(AVCodecParserContext *s, ...@@ -132,10 +142,10 @@ static inline int parse_nal_units(AVCodecParserContext *s,
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, ...@@ -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); 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;
...@@ -178,18 +188,21 @@ static inline int parse_nal_units(AVCodecParserContext *s, ...@@ -178,18 +188,21 @@ static inline int parse_nal_units(AVCodecParserContext *s,
/* 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];
...@@ -198,13 +211,13 @@ static inline int parse_nal_units(AVCodecParserContext *s, ...@@ -198,13 +211,13 @@ static inline int parse_nal_units(AVCodecParserContext *s,
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{
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; if (get_bits1(&h->gb)) { // field_pic_flag
h->picture_structure = PICT_TOP_FIELD + get_bits1(&h->gb); // bottom_field_flag
} else {
h->picture_structure = PICT_FRAME;
} }
} }
...@@ -213,20 +226,23 @@ static inline int parse_nal_units(AVCodecParserContext *s, ...@@ -213,20 +226,23 @@ 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:
...@@ -320,9 +336,9 @@ static int h264_parse(AVCodecParserContext *s, ...@@ -320,9 +336,9 @@ 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) {
...@@ -331,8 +347,8 @@ static int h264_parse(AVCodecParserContext *s, ...@@ -331,8 +347,8 @@ static int h264_parse(AVCodecParserContext *s,
return buf_size; return buf_size;
} }
if(next<0 && next != END_NOT_FOUND){ if (next < 0 && next != END_NOT_FOUND) {
assert(pc->last_index + next >= 0 ); 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
} }
} }
...@@ -363,21 +379,26 @@ static int h264_split(AVCodecContext *avctx, ...@@ -363,21 +379,26 @@ 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;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment