ref: 71ffc7d7ffb7b869404ed8440d05930ff3048e94
parent: 1eee13c0abe869e5140d8943c243864868382f18
parent: 3ab4d5719669af665e03ea5bd0a96164f8ccabff
author: Alex Converse <[email protected]>
date: Wed Apr 9 12:45:46 EDT 2014
Merge "Remove unused tile arguments from vp_rdopt."
--- a/vp9/encoder/vp9_rdopt.c
+++ b/vp9/encoder/vp9_rdopt.c
@@ -2367,7 +2367,6 @@
}
static void single_motion_search(VP9_COMP *cpi, MACROBLOCK *x,
- const TileInfo *const tile,
BLOCK_SIZE bsize,
int mi_row, int mi_col,
int_mv *tmp_mv, int *rate_mv) {@@ -2685,7 +2684,6 @@
}
static int64_t handle_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
- const TileInfo *const tile,
BLOCK_SIZE bsize,
int64_t txfm_cache[],
int *rate2, int64_t *distortion,
@@ -2747,7 +2745,7 @@
*rate2 += rate_mv;
} else {int_mv tmp_mv;
- single_motion_search(cpi, x, tile, bsize, mi_row, mi_col,
+ single_motion_search(cpi, x, bsize, mi_row, mi_col,
&tmp_mv, &rate_mv);
if (tmp_mv.as_int == INVALID_MV)
return INT64_MAX;
@@ -3437,7 +3435,7 @@
rate2 += intra_cost_penalty;
distortion2 = distortion_y + distortion_uv;
} else {- this_rd = handle_inter_mode(cpi, x, tile, bsize,
+ this_rd = handle_inter_mode(cpi, x, bsize,
tx_cache,
&rate2, &distortion2, &skippable,
&rate_y, &distortion_y,