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

revise two function definitions with less parameters

Browse Source 
Change-Id: Ia96e5bf915e4d3c0ac9c1795114bd9e5dd07327a
This commit is contained in:
Yaowu Xu 2011-05-19 18:37:13 -07:00
parent 1f3f18443d
commit a4c69e9a0f
4 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
vp8/encoder/encodeintra.c
View File

@ -27,10 +27,16 @@
#else #else
#define IF_RTCD(x) NULL #define IF_RTCD(x) NULL
#endif #endif
void vp8_encode_intra4x4block(const VP8_ENCODER_RTCD *rtcd, MACROBLOCK *x, BLOCK *be, BLOCKD *b, int best_mode)
void vp8_encode_intra4x4block(const VP8_ENCODER_RTCD *rtcd,
MACROBLOCK *x, int ib)
{ {
BLOCKD *b = &x->e_mbd.block[ib];
BLOCK *be = &x->block[ib];
RECON_INVOKE(&rtcd->common->recon, intra4x4_predict) RECON_INVOKE(&rtcd->common->recon, intra4x4_predict)
(b, best_mode, b->predictor); (b, b->bmi.mode, b->predictor);
ENCODEMB_INVOKE(&rtcd->encodemb, subb)(be, b, 16); ENCODEMB_INVOKE(&rtcd->encodemb, subb)(be, b, 16);
@ -51,13 +57,7 @@ void vp8_encode_intra4x4mby(const VP8_ENCODER_RTCD *rtcd, MACROBLOCK *mb)
vp8_intra_prediction_down_copy(x); vp8_intra_prediction_down_copy(x);
for (i = 0; i < 16; i++) for (i = 0; i < 16; i++)
{ vp8_encode_intra4x4block(rtcd, mb, i);
BLOCK *be = &mb->block[i];
BLOCKD *b = &x->block[i];
vp8_encode_intra4x4block(rtcd, mb, be, b, b->bmi.mode);
}
return; return;
} }

4
vp8/encoder/encodeintra.h
View File

@ -16,6 +16,6 @@
void vp8_encode_intra16x16mby(const VP8_ENCODER_RTCD *, MACROBLOCK *x); void vp8_encode_intra16x16mby(const VP8_ENCODER_RTCD *, MACROBLOCK *x);
void vp8_encode_intra16x16mbuv(const VP8_ENCODER_RTCD *, MACROBLOCK *x); void vp8_encode_intra16x16mbuv(const VP8_ENCODER_RTCD *, MACROBLOCK *x);
void vp8_encode_intra4x4mby(const VP8_ENCODER_RTCD *, MACROBLOCK *mb); void vp8_encode_intra4x4mby(const VP8_ENCODER_RTCD *, MACROBLOCK *mb);
void vp8_encode_intra4x4block(const VP8_ENCODER_RTCD *, MACROBLOCK *x, BLOCK *be, BLOCKD *b, int best_mode); void vp8_encode_intra4x4block(const VP8_ENCODER_RTCD *rtcd,
MACROBLOCK *x, int ib);
#endif #endif

6
vp8/encoder/firstpass.c
View File

@ -100,10 +100,8 @@ static int encode_intra(VP8_COMP *cpi, MACROBLOCK *x, int use_dc_pred)
{ {
for (i = 0; i < 16; i++) for (i = 0; i < 16; i++)
{ {
BLOCKD *b = &x->e_mbd.block[i]; x->e_mbd.block[i].bmi.mode = B_DC_PRED;
BLOCK *be = &x->block[i]; vp8_encode_intra4x4block(IF_RTCD(&cpi->rtcd), x, i);
vp8_encode_intra4x4block(IF_RTCD(&cpi->rtcd), x, be, b, B_DC_PRED);
} }
} }

12
vp8/encoder/pickinter.c
View File

@ -170,8 +170,7 @@ static int get_prediction_error(BLOCK *be, BLOCKD *b, const vp8_variance_rtcd_vt
static int pick_intra4x4block( static int pick_intra4x4block(
const VP8_ENCODER_RTCD *rtcd, const VP8_ENCODER_RTCD *rtcd,
MACROBLOCK *x, MACROBLOCK *x,
BLOCK *be, int ib,
BLOCKD *b,
B_PREDICTION_MODE *best_mode, B_PREDICTION_MODE *best_mode,
B_PREDICTION_MODE above, B_PREDICTION_MODE above,
B_PREDICTION_MODE left, B_PREDICTION_MODE left,
@ -179,6 +178,9 @@ static int pick_intra4x4block(
int *bestrate, int *bestrate,
int *bestdistortion) int *bestdistortion)
{ {
BLOCKD *b = &x->e_mbd.block[ib];
BLOCK *be = &x->block[ib];
B_PREDICTION_MODE mode; B_PREDICTION_MODE mode;
int best_rd = INT_MAX; // 1<<30 int best_rd = INT_MAX; // 1<<30
int rate; int rate;
@ -214,8 +216,7 @@ static int pick_intra4x4block(
} }
b->bmi.mode = (B_PREDICTION_MODE)(*best_mode); b->bmi.mode = (B_PREDICTION_MODE)(*best_mode);
vp8_encode_intra4x4block(rtcd, x, be, b, b->bmi.mode); vp8_encode_intra4x4block(rtcd, x, ib);
return best_rd; return best_rd;
} }
@ -245,8 +246,7 @@ int vp8_pick_intra4x4mby_modes
B_PREDICTION_MODE UNINITIALIZED_IS_SAFE(best_mode); B_PREDICTION_MODE UNINITIALIZED_IS_SAFE(best_mode);
int UNINITIALIZED_IS_SAFE(r), UNINITIALIZED_IS_SAFE(d); int UNINITIALIZED_IS_SAFE(r), UNINITIALIZED_IS_SAFE(d);
pick_intra4x4block(rtcd, mb, mb->block + i, xd->block + i, pick_intra4x4block(rtcd, mb, i, &best_mode, A, L, &r, &d);
&best_mode, A, L, &r, &d);
cost += r; cost += r;
distortion += d; distortion += d;