virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-09-16 08:36:51 +02:00
Code Issues Releases Activity

Merge the single line function decode_cabac_mb_transform_size()

Browse Source 
into the calling code.
8 cpu cycles faster

Originally committed as revision 21828 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer
2010-02-15 01:04:07 +00:00
parent 8b38d10761
commit 64dd1b0a1d
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/h264_cabac.c
View File

@@ -925,10 +925,6 @@ static int decode_cabac_b_mb_sub_type( H264Context *h ) {
return type; return type;
} }
static inline int decode_cabac_mb_transform_size( H264Context *h ) {
return get_cabac_noinline( &h->cabac, &h->cabac_state[399 + h->neighbor_transform_size] );
}
static int decode_cabac_mb_ref( H264Context *h, int list, int n ) { static int decode_cabac_mb_ref( H264Context *h, int list, int n ) {
int refa = h->ref_cache[list][scan8[n] - 1]; int refa = h->ref_cache[list][scan8[n] - 1];
int refb = h->ref_cache[list][scan8[n] - 8]; int refb = h->ref_cache[list][scan8[n] - 8];
@@ -1387,7 +1383,7 @@ decode_intra_mb:
if( IS_INTRA( mb_type ) ) { if( IS_INTRA( mb_type ) ) {
int i, pred_mode; int i, pred_mode;
if( IS_INTRA4x4( mb_type ) ) { if( IS_INTRA4x4( mb_type ) ) {
if( dct8x8_allowed && decode_cabac_mb_transform_size( h ) ) { if( dct8x8_allowed && get_cabac_noinline( &h->cabac, &h->cabac_state[399 + h->neighbor_transform_size] ) ) {
mb_type |= MB_TYPE_8x8DCT; mb_type |= MB_TYPE_8x8DCT;
for( i = 0; i < 16; i+=4 ) { for( i = 0; i < 16; i+=4 ) {
int pred = pred_intra_mode( h, i ); int pred = pred_intra_mode( h, i );
@@ -1649,8 +1645,7 @@ decode_intra_mb:
h->cbp_table[mb_xy] = h->cbp = cbp; h->cbp_table[mb_xy] = h->cbp = cbp;
if( dct8x8_allowed && (cbp&15) && !IS_INTRA( mb_type ) ) { if( dct8x8_allowed && (cbp&15) && !IS_INTRA( mb_type ) ) {
if( decode_cabac_mb_transform_size( h ) ) mb_type |= MB_TYPE_8x8DCT * get_cabac_noinline( &h->cabac, &h->cabac_state[399 + h->neighbor_transform_size] );
mb_type |= MB_TYPE_8x8DCT;
} }
s->current_picture.mb_type[mb_xy]= mb_type; s->current_picture.mb_type[mb_xy]= mb_type;