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

Reorder the if/else for residual cats to match gcc's branch prediction.

Browse Source 
Originally committed as revision 14053 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Alexander Strange 2008-07-02 22:20:06 +00:00
parent 47775cb8de
commit 142ee5d73d
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libavcodec/h264.c
View File

@ -5350,13 +5350,13 @@ static av_always_inline int get_cabac_cbf_ctx( H264Context *h, int cat, int idx,
nzb = (h-> top_cbp>>(6+idx))&0x01; nzb = (h-> top_cbp>>(6+idx))&0x01;
} }
} else { } else {
if( cat == 1 || cat == 2 ) { if( cat == 4 ) {
nza = h->non_zero_count_cache[scan8[idx] - 1];
nzb = h->non_zero_count_cache[scan8[idx] - 8];
} else {
assert(cat == 4);
nza = h->non_zero_count_cache[scan8[16+idx] - 1]; nza = h->non_zero_count_cache[scan8[16+idx] - 1];
nzb = h->non_zero_count_cache[scan8[16+idx] - 8]; nzb = h->non_zero_count_cache[scan8[16+idx] - 8];
} else {
assert(cat == 1 || cat == 2);
nza = h->non_zero_count_cache[scan8[idx] - 1];
nzb = h->non_zero_count_cache[scan8[idx] - 8];
} }
} }
@ -5447,10 +5447,10 @@ static av_always_inline void decode_cabac_residual_internal( H264Context *h, DCT
if( is_dc || cat != 5 ) { if( is_dc || cat != 5 ) {
if( get_cabac( CC, &h->cabac_state[85 + get_cabac_cbf_ctx( h, cat, n, is_dc ) ] ) == 0 ) { if( get_cabac( CC, &h->cabac_state[85 + get_cabac_cbf_ctx( h, cat, n, is_dc ) ] ) == 0 ) {
if( !is_dc ) { if( !is_dc ) {
if( cat == 1 || cat == 2 ) if( cat == 4 )
h->non_zero_count_cache[scan8[n]] = 0;
else
h->non_zero_count_cache[scan8[16+n]] = 0; h->non_zero_count_cache[scan8[16+n]] = 0;
else
h->non_zero_count_cache[scan8[n]] = 0;
} }
#ifdef CABAC_ON_STACK #ifdef CABAC_ON_STACK
@ -5504,13 +5504,13 @@ static av_always_inline void decode_cabac_residual_internal( H264Context *h, DCT
else else
h->cbp_table[h->mb_xy] |= 0x40 << n; h->cbp_table[h->mb_xy] |= 0x40 << n;
} else { } else {
if( cat == 1 || cat == 2 ) if( cat == 5 )
h->non_zero_count_cache[scan8[n]] = coeff_count; fill_rectangle(&h->non_zero_count_cache[scan8[n]], 2, 2, 8, coeff_count, 1);
else if( cat == 4 ) else if( cat == 4 )
h->non_zero_count_cache[scan8[16+n]] = coeff_count; h->non_zero_count_cache[scan8[16+n]] = coeff_count;
else { else {
assert( cat == 5 ); assert( cat == 1 || cat == 2 );
fill_rectangle(&h->non_zero_count_cache[scan8[n]], 2, 2, 8, coeff_count, 1); h->non_zero_count_cache[scan8[n]] = coeff_count;
} }
} }