diff options
| author | Yaowu Xu <yaowu@google.com> | 2014-01-21 18:02:50 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-01-21 18:02:50 -0800 |
| commit | 4e2ae30287afe4a2c45dd979a085077cabc7a48d (patch) | |
| tree | fd7dd7bdf27733e9e5b2c32b02df9be29f6e360a /vp9/encoder | |
| parent | da54de0c091ebafe15aac75433ea4f01a5e844fb (diff) | |
| parent | 3fa1356994e2309b632d8863957c91f7f0813847 (diff) | |
| download | libvpx-4e2ae30287afe4a2c45dd979a085077cabc7a48d.tar libvpx-4e2ae30287afe4a2c45dd979a085077cabc7a48d.tar.gz libvpx-4e2ae30287afe4a2c45dd979a085077cabc7a48d.tar.bz2 libvpx-4e2ae30287afe4a2c45dd979a085077cabc7a48d.zip | |
Merge "remove complex rd modeling."
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index fa6b362d4..5cd89ff64 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -419,18 +419,12 @@ static void model_rd_for_sb(VP9_COMP *cpi, BLOCK_SIZE bsize, struct macroblock_plane *const p = &x->plane[i]; struct macroblockd_plane *const pd = &xd->plane[i]; const BLOCK_SIZE bs = get_plane_block_size(bsize, pd); - int rate; - int64_t dist; (void) cpi->fn_ptr[bs].vf(p->src.buf, p->src.stride, pd->dst.buf, pd->dst.stride, &sse); if (i == 0) x->pred_sse[ref] = sse; - // sse works better than var, since there is no dc prediction used - model_rd_from_var_lapndz(sse, 1 << num_pels_log2_lookup[bs], - pd->dequant[1] >> 3, &rate, &dist); - rate_sum += rate; - dist_sum += (int)dist; + dist_sum += (int)sse; } *out_rate_sum = rate_sum; |