source/libvpx/vp9/encoder/vp9_pickmode.c - Issue 390713002: libvpx: Pull from upstream

Unified Diff: source/libvpx/vp9/encoder/vp9_pickmode.c

Issue 390713002: libvpx: Pull from upstream (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/libvpx/

Patch Set: libvpx: Pull from upstream Created 6 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: source/libvpx/vp9/encoder/vp9_pickmode.c

===================================================================

--- source/libvpx/vp9/encoder/vp9_pickmode.c (revision 282873)

+++ source/libvpx/vp9/encoder/vp9_pickmode.c (working copy)

@@ -106,26 +106,31 @@

return const_motion;

}

-static void full_pixel_motion_search(VP9_COMP *cpi, MACROBLOCK *x,

- BLOCK_SIZE bsize, int mi_row, int mi_col,

- int_mv *tmp_mv, int *rate_mv) {

+static int combined_motion_search(VP9_COMP *cpi, MACROBLOCK *x,

+ BLOCK_SIZE bsize, int mi_row, int mi_col,

+ int_mv *tmp_mv, int *rate_mv,

+ int64_t best_rd_sofar) {

MACROBLOCKD *xd = &x->e_mbd;

MB_MODE_INFO *mbmi = &xd->mi[0]->mbmi;

struct buf_2d backup_yv12[MAX_MB_PLANE] = {{0, 0}};

- int step_param;

- int sadpb = x->sadperbit16;

+ const int step_param = cpi->sf.mv.fullpel_search_step_param;

+ const int sadpb = x->sadperbit16;

MV mvp_full;

- int ref = mbmi->ref_frame[0];

+ const int ref = mbmi->ref_frame[0];

const MV ref_mv = mbmi->ref_mvs[ref][0].as_mv;

- int i;

- int tmp_col_min = x->mv_col_min;

- int tmp_col_max = x->mv_col_max;

- int tmp_row_min = x->mv_row_min;

- int tmp_row_max = x->mv_row_max;

+ int dis;

+ int rate_mode;

+ const int tmp_col_min = x->mv_col_min;

+ const int tmp_col_max = x->mv_col_max;

+ const int tmp_row_min = x->mv_row_min;

+ const int tmp_row_max = x->mv_row_max;

+ int rv = 0;

const YV12_BUFFER_CONFIG *scaled_ref_frame = vp9_get_scaled_ref_frame(cpi,

ref);

+ if (cpi->common.show_frame &&

+ (x->pred_mv_sad[ref] >> 3) > x->pred_mv_sad[LAST_FRAME])

+ return rv;

if (scaled_ref_frame) {

int i;

// Swap out the reference frame for a version that's been scaled to

@@ -133,28 +138,10 @@

// motion search code to be used without additional modifications.

for (i = 0; i < MAX_MB_PLANE; i++)

backup_yv12[i] = xd->plane[i].pre[0];

vp9_setup_pre_planes(xd, 0, scaled_ref_frame, mi_row, mi_col, NULL);

}

vp9_set_mv_search_range(x, &ref_mv);

- // TODO(jingning) exploiting adaptive motion search control in non-RD

- // mode decision too.

- step_param = cpi->sf.mv.fullpel_search_step_param;

- for (i = LAST_FRAME; i <= LAST_FRAME && cpi->common.show_frame; ++i) {

- if ((x->pred_mv_sad[ref] >> 3) > x->pred_mv_sad[i]) {

- tmp_mv->as_int = INVALID_MV;

- if (scaled_ref_frame) {

- int i;

- for (i = 0; i < MAX_MB_PLANE; i++)

- xd->plane[i].pre[0] = backup_yv12[i];

- }

- return;

- }

assert(x->mv_best_ref_index[ref] <= 2);

if (x->mv_best_ref_index[ref] < 2)

mvp_full = mbmi->ref_mvs[ref][x->mv_best_ref_index[ref]].as_mv;

@@ -172,60 +159,39 @@

x->mv_row_min = tmp_row_min;

x->mv_row_max = tmp_row_max;

- if (scaled_ref_frame) {

- int i;

- for (i = 0; i < MAX_MB_PLANE; i++)

- xd->plane[i].pre[0] = backup_yv12[i];

- }

// calculate the bit cost on motion vector

mvp_full.row = tmp_mv->as_mv.row * 8;

mvp_full.col = tmp_mv->as_mv.col * 8;

*rate_mv = vp9_mv_bit_cost(&mvp_full, &ref_mv,

x->nmvjointcost, x->mvcost, MV_COST_WEIGHT);

-static void sub_pixel_motion_search(VP9_COMP *cpi, MACROBLOCK *x,

- BLOCK_SIZE bsize, int mi_row, int mi_col,

- MV *tmp_mv) {

- MACROBLOCKD *xd = &x->e_mbd;

- MB_MODE_INFO *mbmi = &xd->mi[0]->mbmi;

- struct buf_2d backup_yv12[MAX_MB_PLANE] = {{0, 0}};

- int ref = mbmi->ref_frame[0];

- MV ref_mv = mbmi->ref_mvs[ref][0].as_mv;

- int dis;

+ rate_mode = cpi->inter_mode_cost[mbmi->mode_context[ref]]

+ [INTER_OFFSET(NEWMV)];

+ rv = !(RDCOST(x->rdmult, x->rddiv, (*rate_mv + rate_mode), 0) >

+ best_rd_sofar);

- const YV12_BUFFER_CONFIG *scaled_ref_frame = vp9_get_scaled_ref_frame(cpi,

- ref);

- if (scaled_ref_frame) {

- int i;

- // Swap out the reference frame for a version that's been scaled to

- // match the resolution of the current frame, allowing the existing

- // motion search code to be used without additional modifications.

- for (i = 0; i < MAX_MB_PLANE; i++)

- backup_yv12[i] = xd->plane[i].pre[0];

- vp9_setup_pre_planes(xd, 0, scaled_ref_frame, mi_row, mi_col, NULL);

+ if (rv) {

+ cpi->find_fractional_mv_step(x, &tmp_mv->as_mv, &ref_mv,

+ cpi->common.allow_high_precision_mv,

+ x->errorperbit,

+ &cpi->fn_ptr[bsize],

+ cpi->sf.mv.subpel_force_stop,

+ cpi->sf.mv.subpel_iters_per_step,

+ x->nmvjointcost, x->mvcost,

+ &dis, &x->pred_sse[ref], NULL, 0, 0);

+ x->pred_mv[ref] = tmp_mv->as_mv;

}

- cpi->find_fractional_mv_step(x, tmp_mv, &ref_mv,

- cpi->common.allow_high_precision_mv,

- x->errorperbit,

- &cpi->fn_ptr[bsize],

- cpi->sf.mv.subpel_force_stop,

- cpi->sf.mv.subpel_iters_per_step,

- x->nmvjointcost, x->mvcost,

- &dis, &x->pred_sse[ref]);

if (scaled_ref_frame) {

int i;

for (i = 0; i < MAX_MB_PLANE; i++)

xd->plane[i].pre[0] = backup_yv12[i];

}

- x->pred_mv[ref] = *tmp_mv;

+ return rv;

}

static void model_rd_for_sb_y(VP9_COMP *cpi, BLOCK_SIZE bsize,

MACROBLOCK *x, MACROBLOCKD *xd,

int *out_rate_sum, int64_t *out_dist_sum,

@@ -321,7 +287,7 @@

// Adjust ac threshold according to partition size.

thresh_ac >>=

- 8 - (b_width_log2_lookup[bsize] + b_height_log2_lookup[bsize]);

+ 8 - (b_width_log2(bsize) + b_height_log2(bsize));

thresh_dc = (xd->plane[0].dequant[0] * xd->plane[0].dequant[0] >> 6);

} else {

@@ -421,7 +387,7 @@

// Mode index conversion form THR_MODES to PREDICTION_MODE for a ref frame.

int mode_idx[MB_MODE_COUNT] = {0};

INTERP_FILTER filter_ref = cm->interp_filter;

- int bsl = mi_width_log2_lookup[bsize];

+ int bsl = mi_width_log2(bsize);

const int pred_filter_search = cm->interp_filter == SWITCHABLE ?

(((mi_row + mi_col) >> bsl) + get_chessboard_index(cm)) % 2 : 0;

int const_motion[MAX_REF_FRAMES] = { 0 };

@@ -544,28 +510,17 @@

continue;

if (this_mode == NEWMV) {

- int rate_mode = 0;

if (this_rd < (int64_t)(1 << num_pels_log2_lookup[bsize]))

continue;

- full_pixel_motion_search(cpi, x, bsize, mi_row, mi_col,

- &frame_mv[NEWMV][ref_frame], &rate_mv);

- if (frame_mv[NEWMV][ref_frame].as_int == INVALID_MV)

+ if (!combined_motion_search(cpi, x, bsize, mi_row, mi_col,

+ &frame_mv[NEWMV][ref_frame],

+ &rate_mv, best_rd))

continue;

- rate_mode = cpi->inter_mode_cost[mbmi->mode_context[ref_frame]]

- [INTER_OFFSET(this_mode)];

- if (RDCOST(x->rdmult, x->rddiv, rate_mv + rate_mode, 0) > best_rd)

- continue;

- sub_pixel_motion_search(cpi, x, bsize, mi_row, mi_col,

- &frame_mv[NEWMV][ref_frame].as_mv);

}

- if (this_mode != NEARESTMV)

- if (frame_mv[this_mode][ref_frame].as_int ==

- frame_mv[NEARESTMV][ref_frame].as_int)

+ if (this_mode != NEARESTMV &&

+ frame_mv[this_mode][ref_frame].as_int ==

+ frame_mv[NEARESTMV][ref_frame].as_int)

continue;

mbmi->mode = this_mode;

@@ -720,6 +675,7 @@

int i, j;

const int width = num_4x4_blocks_wide_lookup[bsize];

const int height = num_4x4_blocks_high_lookup[bsize];

+ const BLOCK_SIZE bsize_tx = txsize_to_bsize[mbmi->tx_size];

int rate2 = 0;

int64_t dist2 = 0;

@@ -745,7 +701,7 @@

src_stride,

&pd->dst.buf[4 * (j * dst_stride + i)],

dst_stride, i, j, 0);

- model_rd_for_sb_y(cpi, bsize, x, xd, &rate, &dist, &var_y, &sse_y);

+ model_rd_for_sb_y(cpi, bsize_tx, x, xd, &rate, &dist, &var_y, &sse_y);

rate2 += rate;

dist2 += dist;

++block_idx;

« no previous file with comments | « source/libvpx/vp9/encoder/vp9_mcomp.c ('k') | source/libvpx/vp9/encoder/vp9_quantize.c » ('j') | no next file with comments »