Mercurial > libavcodec.hg
diff h264_cabac.c @ 11004:1c3b1752d6d6 libavcodec
Optimize decode_cabac_field_decoding_flag().
~4 cpu cycles faster
author | michael |
---|---|
date | Mon, 25 Jan 2010 02:44:34 +0000 |
parents | 34a65026fa06 |
children | 5bd834bd759b |
line wrap: on
line diff
--- a/h264_cabac.c Mon Jan 25 01:56:13 2010 +0000 +++ b/h264_cabac.c Mon Jan 25 02:44:34 2010 +0000 @@ -706,21 +706,15 @@ static int decode_cabac_field_decoding_flag(H264Context *h) { MpegEncContext * const s = &h->s; - const int mb_x = s->mb_x; - const int mb_y = s->mb_y & ~1; - const int mba_xy = mb_x - 1 + mb_y *s->mb_stride; - const int mbb_xy = mb_x + (mb_y-2)*s->mb_stride; + const long mba_xy = h->mb_xy - 1L; + const long mbb_xy = h->mb_xy - 2L*s->mb_stride; - unsigned int ctx = 0; + unsigned long ctx = 0; - if( h->slice_table[mba_xy] == h->slice_num && IS_INTERLACED( s->current_picture.mb_type[mba_xy] ) ) { - ctx += 1; - } - if( h->slice_table[mbb_xy] == h->slice_num && IS_INTERLACED( s->current_picture.mb_type[mbb_xy] ) ) { - ctx += 1; - } + ctx += (s->current_picture.mb_type[mba_xy]>>7)&(h->slice_table[mba_xy] == h->slice_num); + ctx += (s->current_picture.mb_type[mbb_xy]>>7)&(h->slice_table[mbb_xy] == h->slice_num); - return get_cabac_noinline( &h->cabac, &h->cabac_state[70 + ctx] ); + return get_cabac_noinline( &h->cabac, &(h->cabac_state+70)[ctx] ); } static int decode_cabac_intra_mb_type(H264Context *h, int ctx_base, int intra_slice) {