diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-05-26 00:05:13 -0400 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-05-26 00:05:13 -0400 |
| commit | 26fd970b154f77fcc8eabbcf035c18558bb191cb (patch) | |
| tree | f37fca442cb20d8b937e0d3e1a8e1a43d86ab377 /vp8/encoder/pickinter.c | |
| parent | 117fcb207e2e655cd334b6a8522af7d713b1fcee (diff) | |
| parent | 13b56eeb7a6a61c599c397a3b8cd5b6f77c2f07b (diff) | |
| download | libvpx-26fd970b154f77fcc8eabbcf035c18558bb191cb.tar libvpx-26fd970b154f77fcc8eabbcf035c18558bb191cb.tar.gz libvpx-26fd970b154f77fcc8eabbcf035c18558bb191cb.tar.bz2 libvpx-26fd970b154f77fcc8eabbcf035c18558bb191cb.zip | |
Merge remote branch 'origin/master' into experimental
Change-Id: Ica721b36ffaa6c4c02e1cf82850496c7063ce577
Diffstat (limited to 'vp8/encoder/pickinter.c')
| -rw-r--r-- | vp8/encoder/pickinter.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/vp8/encoder/pickinter.c b/vp8/encoder/pickinter.c index 666948060..d1dc7ae03 100644 --- a/vp8/encoder/pickinter.c +++ b/vp8/encoder/pickinter.c @@ -101,8 +101,7 @@ unsigned int vp8_get16x16pred_error_c const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, - int ref_stride, - int max_sad + int ref_stride ) { unsigned pred_error = 0; @@ -134,8 +133,7 @@ unsigned int vp8_get4x4sse_cs_c const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, - int recon_stride, - int max_sad + int recon_stride ) { int distortion = 0; @@ -163,7 +161,7 @@ static int get_prediction_error(BLOCK *be, BLOCKD *b, const vp8_variance_rtcd_vt sptr = (*(be->base_src) + be->src); dptr = b->predictor; - return VARIANCE_INVOKE(rtcd, get4x4sse_cs)(sptr, be->src_stride, dptr, 16, 0x7fffffff); + return VARIANCE_INVOKE(rtcd, get4x4sse_cs)(sptr, be->src_stride, dptr, 16); } @@ -672,7 +670,7 @@ void vp8_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, distortion2 = VARIANCE_INVOKE (&cpi->rtcd.variance, get16x16prederror)( x->src.y_buffer, x->src.y_stride, - x->e_mbd.predictor, 16, 0x7fffffff); + x->e_mbd.predictor, 16); this_rd = RDCOST(x->rdmult, x->rddiv, rate2, distortion2); if (this_rd < best_intra_rd) @@ -695,7 +693,7 @@ void vp8_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, case TM_PRED: RECON_INVOKE(&cpi->common.rtcd.recon, build_intra_predictors_mby) (&x->e_mbd); - distortion2 = VARIANCE_INVOKE(&cpi->rtcd.variance, get16x16prederror)(x->src.y_buffer, x->src.y_stride, x->e_mbd.predictor, 16, 0x7fffffff); + distortion2 = VARIANCE_INVOKE(&cpi->rtcd.variance, get16x16prederror)(x->src.y_buffer, x->src.y_stride, x->e_mbd.predictor, 16); rate2 += x->mbmode_cost[x->e_mbd.frame_type][x->e_mbd.mode_info_context->mbmi.mode]; this_rd = RDCOST(x->rdmult, x->rddiv, rate2, distortion2); |