diff options
| author | Jingning Han <jingning@google.com> | 2013-08-21 22:07:00 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-08-21 22:07:00 -0700 |
| commit | fcb890d751f34720d3df15fe897e7d5c3d14ba71 (patch) | |
| tree | 8c7954e1a63382519b8762e440f9eb4067214875 /vp9/encoder | |
| parent | ccb6bdca75396f79b1a50d1efa8f1e0d8aab2221 (diff) | |
| parent | 1bf1428654d29e4debe269b424ea3d8d486c45df (diff) | |
| download | libvpx-fcb890d751f34720d3df15fe897e7d5c3d14ba71.tar libvpx-fcb890d751f34720d3df15fe897e7d5c3d14ba71.tar.gz libvpx-fcb890d751f34720d3df15fe897e7d5c3d14ba71.tar.bz2 libvpx-fcb890d751f34720d3df15fe897e7d5c3d14ba71.zip | |
Merge "Enable zero coeff check in sub8x8 UV rd loop"
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index 12f6647fa..5fae2d4aa 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -3599,7 +3599,9 @@ int64_t vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, MACROBLOCK *x, } compmode_cost = vp9_cost_bit(comp_mode_p, is_comp_pred); - tmp_best_rdu = best_rd - RDCOST(x->rdmult, x->rddiv, rate2, distortion2); + tmp_best_rdu = best_rd - + MIN(RDCOST(x->rdmult, x->rddiv, rate2, distortion2), + RDCOST(x->rdmult, x->rddiv, 0, total_sse)); if (tmp_best_rdu > 0) { // If even the 'Y' rd value of split is higher than best so far |