setup_buffer_ref_mvs_inter(): tidy-up
1. remove effectless code.
2. scope variables properly.
Change-Id: Iee3fedd82f5a59984a3babcc19a81cc62324fe58
diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 71e89ab..659b189 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -6953,23 +6953,20 @@
struct buf_2d yv12_mb[REF_FRAMES][MAX_MB_PLANE]) {
const AV1_COMMON *cm = &cpi->common;
const int num_planes = av1_num_planes(cm);
- const YV12_BUFFER_CONFIG *yv12 = get_ref_frame_yv12_buf(cm, ref_frame);
const YV12_BUFFER_CONFIG *scaled_ref_frame =
av1_get_scaled_ref_frame(cpi, ref_frame);
MACROBLOCKD *const xd = &x->e_mbd;
MB_MODE_INFO *const mbmi = xd->mi[0];
- const struct scale_factors *const sf =
- get_ref_scale_factors_const(cm, ref_frame);
MB_MODE_INFO_EXT *const mbmi_ext = x->mbmi_ext;
- assert(yv12 != NULL);
-
- // TODO(jkoleszar): Is the UV buffer ever used here? If so, need to make this
- // use the UV scaling factors.
if (scaled_ref_frame) {
av1_setup_pred_block(xd, yv12_mb[ref_frame], scaled_ref_frame, mi_row,
mi_col, NULL, NULL, num_planes);
} else {
+ const struct scale_factors *const sf =
+ get_ref_scale_factors_const(cm, ref_frame);
+ const YV12_BUFFER_CONFIG *yv12 = get_ref_frame_yv12_buf(cm, ref_frame);
+ assert(yv12 != NULL);
av1_setup_pred_block(xd, yv12_mb[ref_frame], yv12, mi_row, mi_col, sf, sf,
num_planes);
}
@@ -6982,9 +6979,8 @@
// Further refinement that is encode side only to test the top few candidates
// in full and choose the best as the centre point for subsequent searches.
// The current implementation doesn't support scaling.
- (void)block_size;
- av1_mv_pred(cpi, x, yv12_mb[ref_frame][0].buf, yv12->y_stride, ref_frame,
- block_size);
+ av1_mv_pred(cpi, x, yv12_mb[ref_frame][0].buf, yv12_mb[ref_frame][0].stride,
+ ref_frame, block_size);
}
static void single_motion_search(const AV1_COMP *const cpi, MACROBLOCK *x,
