Optimize filter_mb_mbaff_edge*()

Originally committed as revision 21397 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2010-01-23 14:50:56 +00:00
parent 933bea77e5
commit 6b3661b22d
1 changed files with 8 additions and 14 deletions

View File

@ -136,20 +136,16 @@ static void av_noinline filter_mb_edgecv( uint8_t *pix, int stride, int16_t bS[4
static void filter_mb_mbaff_edgev( H264Context *h, uint8_t *pix, int stride, int16_t bS[4], int bsi, int qp ) { static void filter_mb_mbaff_edgev( H264Context *h, uint8_t *pix, int stride, int16_t bS[4], int bsi, int qp ) {
int i; int i;
int index_a = qp + h->slice_alpha_c0_offset;
int alpha = (alpha_table+52)[index_a];
int beta = (beta_table+52)[qp + h->slice_beta_offset];
for( i = 0; i < 8; i++, pix += stride) { for( i = 0; i < 8; i++, pix += stride) {
int index_a;
int alpha;
int beta;
const int bS_index = (i >> 1) * bsi; const int bS_index = (i >> 1) * bsi;
if( bS[bS_index] == 0 ) { if( bS[bS_index] == 0 ) {
continue; continue;
} }
index_a = qp + h->slice_alpha_c0_offset;
alpha = (alpha_table+52)[index_a];
beta = (beta_table+52)[qp + h->slice_beta_offset];
if( bS[bS_index] < 4 ) { if( bS[bS_index] < 4 ) {
const int tc0 = (tc0_table+52)[index_a][bS[bS_index]]; const int tc0 = (tc0_table+52)[index_a][bS[bS_index]];
const int p0 = pix[-1]; const int p0 = pix[-1];
@ -166,10 +162,12 @@ static void filter_mb_mbaff_edgev( H264Context *h, uint8_t *pix, int stride, int
int i_delta; int i_delta;
if( FFABS( p2 - p0 ) < beta ) { if( FFABS( p2 - p0 ) < beta ) {
if(tc0)
pix[-2] = p1 + av_clip( ( p2 + ( ( p0 + q0 + 1 ) >> 1 ) - ( p1 << 1 ) ) >> 1, -tc0, tc0 ); pix[-2] = p1 + av_clip( ( p2 + ( ( p0 + q0 + 1 ) >> 1 ) - ( p1 << 1 ) ) >> 1, -tc0, tc0 );
tc++; tc++;
} }
if( FFABS( q2 - q0 ) < beta ) { if( FFABS( q2 - q0 ) < beta ) {
if(tc0)
pix[1] = q1 + av_clip( ( q2 + ( ( p0 + q0 + 1 ) >> 1 ) - ( q1 << 1 ) ) >> 1, -tc0, tc0 ); pix[1] = q1 + av_clip( ( q2 + ( ( p0 + q0 + 1 ) >> 1 ) - ( q1 << 1 ) ) >> 1, -tc0, tc0 );
tc++; tc++;
} }
@ -227,20 +225,16 @@ static void filter_mb_mbaff_edgev( H264Context *h, uint8_t *pix, int stride, int
} }
static void filter_mb_mbaff_edgecv( H264Context *h, uint8_t *pix, int stride, int16_t bS[4], int bsi, int qp ) { static void filter_mb_mbaff_edgecv( H264Context *h, uint8_t *pix, int stride, int16_t bS[4], int bsi, int qp ) {
int i; int i;
int index_a = qp + h->slice_alpha_c0_offset;
int alpha = (alpha_table+52)[index_a];
int beta = (beta_table+52)[qp + h->slice_beta_offset];
for( i = 0; i < 4; i++, pix += stride) { for( i = 0; i < 4; i++, pix += stride) {
int index_a;
int alpha;
int beta;
const int bS_index = i*bsi; const int bS_index = i*bsi;
if( bS[bS_index] == 0 ) { if( bS[bS_index] == 0 ) {
continue; continue;
} }
index_a = qp + h->slice_alpha_c0_offset;
alpha = (alpha_table+52)[index_a];
beta = (beta_table+52)[qp + h->slice_beta_offset];
if( bS[bS_index] < 4 ) { if( bS[bS_index] < 4 ) {
const int tc = (tc0_table+52)[index_a][bS[bS_index]] + 1; const int tc = (tc0_table+52)[index_a][bS[bS_index]] + 1;
const int p0 = pix[-1]; const int p0 = pix[-1];