diff options
| author | Jingning Han <jingning@google.com> | 2014-03-13 09:14:13 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-03-13 09:14:13 -0700 |
| commit | 1ff4a5b3a255515e61ef0be19ece7307c9e9354b (patch) | |
| tree | 2f021a811069dd88d151d0473356960d41374295 | |
| parent | b25e4061e8597312f012c98db932cd32329c23cc (diff) | |
| parent | 7686c950b563b63bd39f3699558bb22ba965274b (diff) | |
| download | libvpx-1ff4a5b3a255515e61ef0be19ece7307c9e9354b.tar libvpx-1ff4a5b3a255515e61ef0be19ece7307c9e9354b.tar.gz libvpx-1ff4a5b3a255515e61ef0be19ece7307c9e9354b.tar.bz2 libvpx-1ff4a5b3a255515e61ef0be19ece7307c9e9354b.zip | |
Merge "Tune rate-distortion modeling for non-RD mode decision"
| -rw-r--r-- | vp9/encoder/vp9_pickmode.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vp9/encoder/vp9_pickmode.c b/vp9/encoder/vp9_pickmode.c index 567f9301c..cd4632696 100644 --- a/vp9/encoder/vp9_pickmode.c +++ b/vp9/encoder/vp9_pickmode.c @@ -207,14 +207,14 @@ static void model_rd_for_sb_y(VP9_COMP *cpi, BLOCK_SIZE bsize, struct macroblockd_plane *const pd = &xd->plane[0]; const BLOCK_SIZE bs = get_plane_block_size(bsize, pd); - (void) cpi->fn_ptr[bs].vf(p->src.buf, p->src.stride, - pd->dst.buf, pd->dst.stride, &sse); + int var = cpi->fn_ptr[bs].vf(p->src.buf, p->src.stride, + pd->dst.buf, pd->dst.stride, &sse); - vp9_model_rd_from_var_lapndz(sse, 1 << num_pels_log2_lookup[bs], + vp9_model_rd_from_var_lapndz(var + sse, 1 << num_pels_log2_lookup[bs], pd->dequant[1] >> 3, &rate, &dist); *out_rate_sum = rate; - *out_dist_sum = dist << 4; + *out_dist_sum = dist << 3; } // TODO(jingning) placeholder for inter-frame non-RD mode decision. |