ref: 25edb681009779019e4e2a3a1756c61e4ef8fe7b
parent: fb754fd37ea0fe7d3a0ed3bf8469744125a1ca2e
parent: e304160885370685493093dedc23137c7b5ff950
author: Yunqing Wang <[email protected]>
date: Fri Apr 19 10:12:43 EDT 2013
Merge "Remove unused parameters in handle_inter_mode" into experimental
--- a/vp9/encoder/vp9_rdopt.c
+++ b/vp9/encoder/vp9_rdopt.c
@@ -2812,7 +2812,6 @@
static int64_t handle_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
BLOCK_SIZE_TYPE bsize,
- int *saddone, int near_sadidx[],
int mdcounts[4], int64_t txfm_cache[],
int *rate2, int *distortion, int *skippable,
int *compmode_cost,
@@ -3337,9 +3336,6 @@
int distortion_uv = INT_MAX;
int64_t best_yrd = INT64_MAX;
- int near_sadidx[8] = {0, 1, 2, 3, 4, 5, 6, 7};- int saddone = 0;
-
int_mv frame_mv[MB_MODE_COUNT][MAX_REF_FRAMES];
int frame_mdcounts[4][4];
YV12_BUFFER_CONFIG yv12_mb[4];
@@ -3794,7 +3790,7 @@
}
#endif
this_rd = handle_inter_mode(cpi, x, BLOCK_SIZE_MB16X16,
- &saddone, near_sadidx, mdcounts, txfm_cache,
+ mdcounts, txfm_cache,
&rate2, &distortion2, &skippable,
&compmode_cost,
#if CONFIG_COMP_INTERINTRA_PRED
@@ -4306,8 +4302,6 @@
cpi->gld_fb_idx,
cpi->alt_fb_idx};
int mdcounts[4];
- int near_sadidx[8] = { 0, 1, 2, 3, 4, 5, 6, 7 };- int saddone = 0;
int64_t best_rd = INT64_MAX;
int64_t best_txfm_rd[NB_TXFM_MODES];
int64_t best_txfm_diff[NB_TXFM_MODES];
@@ -4565,7 +4559,7 @@
}
#endif
this_rd = handle_inter_mode(cpi, x, bsize,
- &saddone, near_sadidx, mdcounts, txfm_cache,
+ mdcounts, txfm_cache,
&rate2, &distortion2, &skippable,
&compmode_cost,
#if CONFIG_COMP_INTERINTRA_PRED