From a16608aba040957e269ec1e7905c72140cb721b6 Mon Sep 17 00:00:00 2001
From: Yaowu Xu <yaowu@google.com>
Date: Wed, 25 Apr 2012 08:47:33 -0700
Subject: Merge QIMODE experiment

This commit merge the QI mode experiment. As the experiment affects
the encoding of intra coding modes on key frame only, the overall
effect of the experiment on encoding tests is insignificant.

Change-Id: I9e4e3933adface88867ad429cee3986e529c511d
---
 vp8/common/alloccommon.c |  2 --
 vp8/common/entropymode.c | 13 -------------
 vp8/common/onyxc_int.h   |  4 ----
 3 files changed, 19 deletions(-)

(limited to 'vp8/common')

diff --git a/vp8/common/alloccommon.c b/vp8/common/alloccommon.c
index 5a7c79c8f..8bab3452f 100644
--- a/vp8/common/alloccommon.c
+++ b/vp8/common/alloccommon.c
@@ -225,9 +225,7 @@ void vp8_create_common(VP8_COMMON *oci)
     /* Default disable buffer to buffer copying */
     oci->copy_buffer_to_gf = 0;
     oci->copy_buffer_to_arf = 0;
-#if CONFIG_QIMODE
     oci->kf_ymode_probs_update = 0;
-#endif
 }
 
 void vp8_remove_common(VP8_COMMON *oci)
diff --git a/vp8/common/entropymode.c b/vp8/common/entropymode.c
index 7d2b2bb4e..aa8d03717 100644
--- a/vp8/common/entropymode.c
+++ b/vp8/common/entropymode.c
@@ -15,7 +15,6 @@
 #include "vpx_mem/vpx_mem.h"
 
 
-#if CONFIG_QIMODE
 const unsigned int kf_y_mode_cts[8][VP8_YMODES] =
 {
     {17,  6,  5,  2, 22, 203},
@@ -27,10 +26,6 @@ const unsigned int kf_y_mode_cts[8][VP8_YMODES] =
     {88, 38, 39, 19, 16,  57},
     {99, 42, 43, 21, 12,  39},
 };
-#else
-static const unsigned int kf_y_mode_cts[VP8_YMODES] = {
-    49, 22, 23, 11, 23, 128};
-#endif
 
 static const unsigned int y_mode_cts  [VP8_YMODES] = {
     106,  25, 21, 13, 16, 74};
@@ -262,7 +257,6 @@ void vp8_init_mbmode_probs(VP8_COMMON *x)
         x->fc.ymode_prob, bct, y_mode_cts,
         256, 1
     );
-#if CONFIG_QIMODE
     {
         int i;
         for (i=0;i<8;i++)
@@ -272,13 +266,6 @@ void vp8_init_mbmode_probs(VP8_COMMON *x)
             256, 1
             );
     }
-#else
-    vp8_tree_probs_from_distribution(
-        VP8_YMODES, vp8_kf_ymode_encodings, vp8_kf_ymode_tree,
-        x->kf_ymode_prob, bct, kf_y_mode_cts,
-        256, 1
-    );
-#endif
     {
         int i;
         for (i=0;i<VP8_YMODES;i++)
diff --git a/vp8/common/onyxc_int.h b/vp8/common/onyxc_int.h
index 99a80617b..1f4652148 100644
--- a/vp8/common/onyxc_int.h
+++ b/vp8/common/onyxc_int.h
@@ -201,13 +201,9 @@ typedef struct VP8Common
     /* keyframe block modes are predicted by their above, left neighbors */
 
     vp8_prob kf_bmode_prob [VP8_BINTRAMODES] [VP8_BINTRAMODES] [VP8_BINTRAMODES-1];
-#if CONFIG_QIMODE
     vp8_prob kf_ymode_prob[8][VP8_YMODES-1];  /* keyframe "" */
     int kf_ymode_probs_index;
     int kf_ymode_probs_update;
-#else
-    vp8_prob kf_ymode_prob [VP8_YMODES-1];  /* keyframe "" */
-#endif
     vp8_prob kf_uv_mode_prob[VP8_YMODES] [VP8_UV_MODES-1];
     vp8_prob i8x8_mode_prob [VP8_UV_MODES-1];
 
-- 
cgit v1.2.3