commit 7300db5fcb252616db1d182b0ec96a02fa23c6a2
author Yushin Cho <ycho@mozilla.com> Sat May 27 12:40:01 2017 -0700
committer Yushin Cho <ycho@mozilla.com> Sun May 28 20:03:56 2017 +0000
tree d6efccb94898b5618a022d0bb31f87897d603410
parent 0481e8b6e0d387ba12dafed6aaef88cb051f3f7b

Fix pvq to use OD_ICDF when directly accessing skip_cdf

Change-Id: Iac66b12dc6b1e6c3bc3c3ae54af45a97c81e34de

av1/encoder/pvq_encoder.c

diff --git a/av1/encoder/pvq_encoder.c b/av1/encoder/pvq_encoder.c
index 0df238a..9d51330 100644
--- a/av1/encoder/pvq_encoder.c
+++ b/av1/encoder/pvq_encoder.c
@@ -847,8 +847,8 @@
       int tell2;
       od_rollback_buffer dc_buf;
 
-      dc_rate = -OD_LOG2((double)(skip_cdf[3] - skip_cdf[2])/
-       (double)(skip_cdf[2] - skip_cdf[1]));
+      dc_rate = -OD_LOG2((double)(OD_ICDF(skip_cdf[3]) - OD_ICDF(skip_cdf[2]))/
+       (double)(OD_ICDF(skip_cdf[2]) - OD_ICDF(skip_cdf[1])));
       dc_rate += 1;
 
 #if !CONFIG_ANS
@@ -931,12 +931,12 @@
   {
     double skip_rate;
     if (out[0] != 0) {
-      skip_rate = -OD_LOG2((skip_cdf[1] - skip_cdf[0])/
-     (double)skip_cdf[3]);
+      skip_rate = -OD_LOG2((OD_ICDF(skip_cdf[1]) - OD_ICDF(skip_cdf[0]))/
+     (double)OD_ICDF(skip_cdf[3]));
     }
     else {
-      skip_rate = -OD_LOG2(skip_cdf[0]/
-     (double)skip_cdf[3]);
+      skip_rate = -OD_LOG2(OD_ICDF(skip_cdf[0])/
+     (double)OD_ICDF(skip_cdf[3]));
     }
     tell -= (int)floor(.5+8*skip_rate);
   }
@@ -951,8 +951,8 @@
         int tell2;
         od_rollback_buffer dc_buf;
 
-        dc_rate = -OD_LOG2((double)(skip_cdf[1] - skip_cdf[0])/
-         (double)skip_cdf[0]);
+        dc_rate = -OD_LOG2((double)(OD_ICDF(skip_cdf[1]) - OD_ICDF(skip_cdf[0]))/
+         (double)OD_ICDF(skip_cdf[0]));
         dc_rate += 1;
 
 #if !CONFIG_ANS