mozilla
/
aom
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Merge "rename variables to avoid build error in MSVC"

This commit is contained in:
Yaowu Xu 2013-06-20 19:04:30 -07:00 коммит произвёл Gerrit Code Review
Родитель e6cd5ed307 ee07a261a0
Коммит 61721181ec
2 изменённых файлов: 7 добавлений и 8 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

8
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; d = vp9_64x64_zeros;
dp = 64; dp = 64;
if (cm->frame_type != KEY_FRAME) { 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 *ref_fb = &cm->yv12_fb[0];
YV12_BUFFER_CONFIG *second_ref_fb = NULL; 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->scale_factor, xd->scale_factor_uv);
xd->mode_info_context->mbmi.ref_frame[0] = LAST_FRAME; xd->mode_info_context->mbmi.ref_frame[0] = LAST_FRAME;
xd->mode_info_context->mbmi.sb_type = BLOCK_SIZE_SB64X64; 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, vp9_find_best_ref_mvs(xd, m->mbmi.ref_mvs[m->mbmi.ref_frame[0]],
&near); &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); vp9_build_inter_predictors_sby(xd, mi_row, mi_col, BLOCK_SIZE_SB64X64);
d = xd->plane[0].dst.buf; d = xd->plane[0].dst.buf;
dp = xd->plane[0].dst.stride; dp = xd->plane[0].dst.stride;

5
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. // Note our transform coeffs are 8 times an orthogonal transform.
// Hence quantizer step is also 8 times. To get effective quantizer // Hence quantizer step is also 8 times. To get effective quantizer
// we need to divide by 8 before sending to modeling function. // 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; int i, rate_sum = 0, dist_sum = 0;
for (i = 0; i < MAX_MB_PLANE; ++i) { 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 int bh = plane_block_height(bsize, pd);
const enum BlockSize bs = get_block_size(bw, bh); const enum BlockSize bs = get_block_size(bw, bh);
int rate, dist; int rate, dist;
var = cpi->fn_ptr[bs].vf(p->src.buf, p->src.stride, cpi->fn_ptr[bs].vf(p->src.buf, p->src.stride,
pd->dst.buf, pd->dst.stride, &sse); pd->dst.buf, pd->dst.stride, &sse);
// sse works better than var, since there is no dc prediction used
model_rd_from_var_lapndz(sse, bw * bh, pd->dequant[1] >> 3, &rate, &dist); model_rd_from_var_lapndz(sse, bw * bh, pd->dequant[1] >> 3, &rate, &dist);
rate_sum += rate; rate_sum += rate;