Merge "Use right shift to replace division in vp9_pick_inter_mode"
This commit is contained in:
commit
b47f9c5802
@ -537,9 +537,9 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
|
|||||||
// Reduce the intra cost penalty for small blocks (<=16x16).
|
// Reduce the intra cost penalty for small blocks (<=16x16).
|
||||||
const int reduction_fac =
|
const int reduction_fac =
|
||||||
(cpi->sf.partition_search_type == VAR_BASED_PARTITION &&
|
(cpi->sf.partition_search_type == VAR_BASED_PARTITION &&
|
||||||
bsize <= BLOCK_16X16) ? 4 : 1;
|
bsize <= BLOCK_16X16) ? 2 : 0;
|
||||||
const int intra_cost_penalty = vp9_get_intra_cost_penalty(
|
const int intra_cost_penalty = vp9_get_intra_cost_penalty(
|
||||||
cm->base_qindex, cm->y_dc_delta_q, cm->bit_depth) / reduction_fac;
|
cm->base_qindex, cm->y_dc_delta_q, cm->bit_depth) >> reduction_fac;
|
||||||
const int64_t inter_mode_thresh = RDCOST(x->rdmult, x->rddiv,
|
const int64_t inter_mode_thresh = RDCOST(x->rdmult, x->rddiv,
|
||||||
intra_cost_penalty, 0);
|
intra_cost_penalty, 0);
|
||||||
const int8_t segment_id = mbmi->segment_id;
|
const int8_t segment_id = mbmi->segment_id;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user