From: Jingning Han <jingning@google.com>
Date: Tue, 10 Jul 2018 21:40:56 +0000 (-0700)
Subject: Fix the denominator in tpl model
X-Git-Tag: v1.8.0~543
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f13a37cbf7e5936a425498d0f5f9d96a1f6eff45;p=libvpx

Fix the denominator in tpl model

The factor mc_dep_cost includes intra_cost additiona already. Hence
no need to add it again in the denominator.

Change-Id: I750ae86e1d3019b4a3aebd03dec8db362589619e
---

diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c
index 25c5eb32c..21f27b022 100644
--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -3648,7 +3648,7 @@ int get_rdmult_delta(VP9_COMP *cpi, BLOCK_SIZE bsize, int mi_row, int mi_col,
     }
   }
 
-  rk = (double)intra_cost / (intra_cost + mc_dep_cost);
+  rk = (double)intra_cost / mc_dep_cost;
   beta = r0 / rk;
   dr = vp9_get_adaptive_rdmult(cpi, beta);
 
@@ -5460,8 +5460,7 @@ static void encode_frame_internal(VP9_COMP *cpi) {
     }
 
     if (tpl_frame->is_valid)
-      cpi->rd.r0 =
-          (double)intra_cost_base / (intra_cost_base + mc_dep_cost_base);
+      cpi->rd.r0 = (double)intra_cost_base / mc_dep_cost_base;
   }
 
   {