Commit 5d453e39 authored by Jingning Han's avatar Jingning Han

Remove unused code in vp9_rd_pick_inter_mode_sb

Change-Id: I4f0bac3367b1a7c5e7f746b97ca619b81c8dfc49
parent d67b608c
......@@ -2525,8 +2525,6 @@ int64_t vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, MACROBLOCK *x,
PREDICTION_MODE mode_uv[TX_SIZES];
int64_t mode_distortions[MB_MODE_COUNT] = {-1};
int intra_cost_penalty = 20 * vp9_dc_quant(cm->base_qindex, cm->y_dc_delta_q);
const int bws = num_8x8_blocks_wide_lookup[bsize] / 2;
const int bhs = num_8x8_blocks_high_lookup[bsize] / 2;
int best_skip2 = 0;
int mode_skip_mask = 0;
int mode_skip_start = cpi->sf.mode_skip_start + 1;
......@@ -2613,18 +2611,6 @@ int64_t vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, MACROBLOCK *x,
}
}
// TODO(JBB): This is to make up for the fact that we don't have sad
// functions that work when the block size reads outside the umv. We
// should fix this either by making the motion search just work on
// a representative block in the boundary ( first ) and then implement a
// function that does sads when inside the border..
if ((mi_row + bhs) > cm->mi_rows || (mi_col + bws) > cm->mi_cols) {
const int new_modes_mask =
(1 << THR_NEWMV) | (1 << THR_NEWG) | (1 << THR_NEWA) |
(1 << THR_COMP_NEWLA) | (1 << THR_COMP_NEWGA);
mode_skip_mask |= new_modes_mask;
}
if (bsize > cpi->sf.max_intra_bsize) {
const int all_intra_modes = (1 << THR_DC) | (1 << THR_TM) |
(1 << THR_H_PRED) | (1 << THR_V_PRED) | (1 << THR_D135_PRED) |
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment