From ee07a261a0896630441de57087b819e583472d38 Mon Sep 17 00:00:00 2001 From: Yaowu Xu Date: Thu, 20 Jun 2013 11:48:08 -0700 Subject: [PATCH] rename variables to avoid build error in MSVC Change-Id: I7960178c95c54d5c4497e44cfc8c493566294b34 --- vp9/encoder/vp9_encodeframe.c | 8 ++++---- vp9/encoder/vp9_rdopt.c | 7 +++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index 1624bf9..35e1d64 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -1116,7 +1116,7 @@ static void choose_partitioning(VP9_COMP *cpi, MODE_INFO *m, int mi_row, d = vp9_64x64_zeros; dp = 64; if (cm->frame_type != KEY_FRAME) { - int_mv nearest, near; + int_mv nearest_mv, near_mv; YV12_BUFFER_CONFIG *ref_fb = &cm->yv12_fb[0]; YV12_BUFFER_CONFIG *second_ref_fb = NULL; @@ -1124,10 +1124,10 @@ static void choose_partitioning(VP9_COMP *cpi, MODE_INFO *m, int mi_row, xd->scale_factor, xd->scale_factor_uv); xd->mode_info_context->mbmi.ref_frame[0] = LAST_FRAME; xd->mode_info_context->mbmi.sb_type = BLOCK_SIZE_SB64X64; - vp9_find_best_ref_mvs(xd, m->mbmi.ref_mvs[m->mbmi.ref_frame[0]], &nearest, - &near); + vp9_find_best_ref_mvs(xd, m->mbmi.ref_mvs[m->mbmi.ref_frame[0]], + &nearest_mv, &near_mv); - xd->mode_info_context->mbmi.mv[0] = nearest; + xd->mode_info_context->mbmi.mv[0] = nearest_mv; vp9_build_inter_predictors_sby(xd, mi_row, mi_col, BLOCK_SIZE_SB64X64); d = xd->plane[0].dst.buf; dp = xd->plane[0].dst.stride; diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index 7b53f31..be6c191 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -1962,7 +1962,7 @@ static void model_rd_for_sb(VP9_COMP *cpi, BLOCK_SIZE_TYPE bsize, // Note our transform coeffs are 8 times an orthogonal transform. // Hence quantizer step is also 8 times. To get effective quantizer // we need to divide by 8 before sending to modeling function. - unsigned int sse, var; + unsigned int sse; int i, rate_sum = 0, dist_sum = 0; for (i = 0; i < MAX_MB_PLANE; ++i) { @@ -1974,9 +1974,8 @@ static void model_rd_for_sb(VP9_COMP *cpi, BLOCK_SIZE_TYPE bsize, const int bh = plane_block_height(bsize, pd); const enum BlockSize bs = get_block_size(bw, bh); int rate, dist; - var = cpi->fn_ptr[bs].vf(p->src.buf, p->src.stride, - pd->dst.buf, pd->dst.stride, &sse); - // sse works better than var, since there is no dc prediction used + cpi->fn_ptr[bs].vf(p->src.buf, p->src.stride, + pd->dst.buf, pd->dst.stride, &sse); model_rd_from_var_lapndz(sse, bw * bh, pd->dequant[1] >> 3, &rate, &dist); rate_sum += rate; -- 2.7.4