# HG changeset patch # User michael # Date 1266363788 0 # Node ID afc60af2d00892f7e410b6002fd578c1ab6c4aa1 # Parent 638415aafbda3389f45b06112a9815648c57ecb6 2x faster ff_h264_init_cabac_states(), 4k cpu cycles less. Sadly this is just per slice so the speedup with normal files should be negligible. diff -r 638415aafbda -r afc60af2d008 h264_cabac.c --- a/h264_cabac.c Tue Feb 16 14:48:01 2010 +0000 +++ b/h264_cabac.c Tue Feb 16 23:43:08 2010 +0000 @@ -688,19 +688,20 @@ void ff_h264_init_cabac_states(H264Context *h) { MpegEncContext * const s = &h->s; int i; + const int8_t (*tab)[2]; + + if( h->slice_type_nos == FF_I_TYPE ) tab = cabac_context_init_I; + else tab = cabac_context_init_PB[h->cabac_init_idc]; /* calculate pre-state */ for( i= 0; i < 460; i++ ) { - int pre; - if( h->slice_type_nos == FF_I_TYPE ) - pre = av_clip( ((cabac_context_init_I[i][0] * s->qscale) >>4 ) + cabac_context_init_I[i][1], 1, 126 ); - else - pre = av_clip( ((cabac_context_init_PB[h->cabac_init_idc][i][0] * s->qscale) >>4 ) + cabac_context_init_PB[h->cabac_init_idc][i][1], 1, 126 ); + int pre = 2*(((tab[i][0] * s->qscale) >>4 ) + tab[i][1]) - 127; - if( pre <= 63 ) - h->cabac_state[i] = 2 * ( 63 - pre ) + 0; - else - h->cabac_state[i] = 2 * ( pre - 64 ) + 1; + pre^= pre>>31; + if(pre > 124) + pre= 124 + (pre&1); + + h->cabac_state[i] = pre; } }