diff options
| author | Jingning Han <jingning@google.com> | 2014-11-24 22:13:44 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-11-24 22:13:44 -0800 |
| commit | 6912c4413565cb513f6fd0503b8358bc62d98246 (patch) | |
| tree | 41076f73ff5aa6c2bdde5d3f0d577abfa763eab8 /vp9/encoder | |
| parent | edbd61e1362978150b5681125d93cb2bffbb5c53 (diff) | |
| parent | 25be81e2dd2059024f3c3d07e1a6c46063809761 (diff) | |
| download | libvpx-6912c4413565cb513f6fd0503b8358bc62d98246.tar libvpx-6912c4413565cb513f6fd0503b8358bc62d98246.tar.gz libvpx-6912c4413565cb513f6fd0503b8358bc62d98246.tar.bz2 libvpx-6912c4413565cb513f6fd0503b8358bc62d98246.zip | |
Merge "Remove redundant intra mode penalty from vp9_pick_inter_mode"
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_pickmode.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/vp9/encoder/vp9_pickmode.c b/vp9/encoder/vp9_pickmode.c index 6bb979403..1bf77a091 100644 --- a/vp9/encoder/vp9_pickmode.c +++ b/vp9/encoder/vp9_pickmode.c @@ -548,8 +548,6 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, 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 int intra_mode_cost = 50; - const int8_t segment_id = mbmi->segment_id; const int *const rd_threshes = cpi->rd.threshes[segment_id][bsize]; const int *const rd_thresh_freq_fact = tile_data->thresh_freq_fact[bsize]; @@ -887,7 +885,7 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, this_rdc.rdcost = RDCOST(x->rdmult, x->rddiv, this_rdc.rate, this_rdc.dist); - if (this_rdc.rdcost + intra_mode_cost < best_rdc.rdcost) { + if (this_rdc.rdcost < best_rdc.rdcost) { best_rdc = this_rdc; mbmi->mode = this_mode; mbmi->tx_size = intra_tx_size; |