shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Use right shift to replace division in vp9_pick_inter_mode"

--- a/vp9/encoder/vp9_pickmode.c

+++ b/vp9/encoder/vp9_pickmode.c

@@ -537,9 +537,9 @@

   // Reduce the intra cost penalty for small blocks (<=16x16).

   const int reduction_fac =

       (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(

-      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,

                                            intra_cost_penalty, 0);

   const int8_t segment_id = mbmi->segment_id;