add quantizer adaptive intra mb mode encoding

make intra mode coding entropy distribution adaptive to baseQindex, an
encoding test on hd clips with all key frame shows universal gain on
all clips in both .2%(psnr) and (ssim).3%.

To build and test, configure with
--enable-experimental --enable-qimode

Change-Id: Iaa69241b984d4fdd8baa6d77ee78c0140f5ac00a

diff --git a/configure b/configure
index 92fde062786380c7bb38d96a2bb0592f7ee6e342..dbe6211b12ee3eff4467d50e559d0227335849d8 100755 (executable)
--- a/configure
+++ b/configure
@@ -222,6 +222,7 @@ EXPERIMENT_LIST="
     t8x8
     csm
     i8x8
+    qimode
 "
 CONFIG_LIST="
     external_build

diff --git a/vp8/common/blockd.h b/vp8/common/blockd.h
index 21856f130ef8466a6088a77f01fc61897f85e9ad..e5d8bf572f6c34629cc4bbce58fb85e3ddc3a684 100644 (file)
--- a/vp8/common/blockd.h
+++ b/vp8/common/blockd.h
@@ -25,6 +25,8 @@ void vpx_log(const char *format, ...);
 #define TRUE    1
 #define FALSE   0
 
+#define MODE_STATS
+
 /*#define DCPRED 1*/
 #define DCPREDSIMTHRESH 0
 #define DCPREDCNTTHRESH 3

diff --git a/vp8/common/entropymode.c b/vp8/common/entropymode.c
index 8507a5a735a635b1fbae94beef01d8871732b193..da8a54841034e3636f2f0b805b3e9f511f107fb0 100644 (file)
--- a/vp8/common/entropymode.c
+++ b/vp8/common/entropymode.c
@@ -13,7 +13,22 @@
 #include "entropy.h"
 #include "vpx_mem/vpx_mem.h"
 #if CONFIG_I8X8
+
+#if CONFIG_QIMODE
+static const unsigned int kf_y_mode_cts[8][VP8_YMODES] =
+{
+    {17,  6,  5,  2, 22, 203},
+    {27, 13, 13,  6, 27, 170},
+    {35, 17, 18,  9, 26, 152},
+    {45, 22, 24, 12, 27, 126},
+    {58, 26, 29, 13, 26, 104},
+    {73, 33, 36, 17, 20,  78},
+    {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] = { 8080, 1908, 1582, 1007, 0, 5874};
 #else
 static const unsigned int kf_y_mode_cts[VP8_YMODES] = { 1607, 915, 812, 811, 5455};
@@ -222,11 +237,23 @@ 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++)
+        vp8_tree_probs_from_distribution(
+            VP8_YMODES, vp8_kf_ymode_encodings, vp8_kf_ymode_tree,
+            x->kf_ymode_prob[i], bct, kf_y_mode_cts[i],
+            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
     vp8_tree_probs_from_distribution(
         VP8_UV_MODES, vp8_uv_mode_encodings, vp8_uv_mode_tree,
         x->fc.uv_mode_prob, bct, uv_mode_cts,

diff --git a/vp8/common/onyxc_int.h b/vp8/common/onyxc_int.h
index a2ae3506258e12e13aecef13926a6e822e7124c9..de1c312fabfd766e550009baf1c2e04ff1e65392 100644 (file)
--- a/vp8/common/onyxc_int.h
+++ b/vp8/common/onyxc_int.h
@@ -183,7 +183,11 @@ 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 "" */
+#else
     vp8_prob kf_ymode_prob [VP8_YMODES-1];  /* keyframe "" */
+#endif
     vp8_prob kf_uv_mode_prob [VP8_UV_MODES-1];
 #if CONFIG_I8X8
     vp8_prob i8x8_mode_prob [VP8_UV_MODES-1];

diff --git a/vp8/decoder/decodemv.c b/vp8/decoder/decodemv.c
index 85abf826f89b0ef81047737f01410c18b78c7fff..36feb28be137c781f147d2777b557db8f62a4bdd 100644 (file)
--- a/vp8/decoder/decodemv.c
+++ b/vp8/decoder/decodemv.c
@@ -90,9 +90,12 @@ static void vp8_kfread_modes(VP8D_COMP *pbi, MODE_INFO *m, int mb_row, int mb_co
                 m->mbmi.mb_skip_coeff = vp8_read(bc, pbi->prob_skip_false);
             else
                 m->mbmi.mb_skip_coeff = 0;
-
+#if CONFIG_QIMODE
+            y_mode = (MB_PREDICTION_MODE) vp8_kfread_ymode(bc,
+                pbi->common.kf_ymode_prob[pbi->common.base_qindex>>4]);
+#else
             y_mode = (MB_PREDICTION_MODE) vp8_kfread_ymode(bc, pbi->common.kf_ymode_prob);
-
+#endif
             m->mbmi.ref_frame = INTRA_FRAME;
 
             if ((m->mbmi.mode = y_mode) == B_PRED)
@@ -124,6 +127,7 @@ static void vp8_kfread_modes(VP8D_COMP *pbi, MODE_INFO *m, int mb_row, int mb_co
                  }
                 //printf("%2d%2d%2d%2d\n", m->bmi[0].as_mode,m->bmi[2].as_mode,
                 //                       m->bmi[8].as_mode,m->bmi[10].as_mode);
+                                         */
            }
             else
 #endif

diff --git a/vp8/encoder/bitstream.c b/vp8/encoder/bitstream.c
index 39a72bcddce73a25a3cfb2948e93fbc200d8fd2a..90a50c276fb4669dae51aa75a1e59227512dac8b 100644 (file)
--- a/vp8/encoder/bitstream.c
+++ b/vp8/encoder/bitstream.c
@@ -1192,8 +1192,11 @@ static void write_kfmodes(VP8_COMP *cpi)
 
             if (c->mb_no_coeff_skip)
                 vp8_encode_bool(bc, m->mbmi.mb_skip_coeff, prob_skip_false);
-
+#if CONFIG_QIMODE
+            kfwrite_ymode(bc, ym, c->kf_ymode_prob[c->base_qindex>>4]);
+#else
             kfwrite_ymode(bc, ym, c->kf_ymode_prob);
+#endif
             if (ym == B_PRED)
             {
                 const int mis = c->mode_info_stride;

diff --git a/vp8/encoder/modecosts.c b/vp8/encoder/modecosts.c
index 892fe9f717e58e70824ba476c0c3ab874cf5d808..846401cb8bd4b80ff6adb1e1a81a25cef31fafbb 100644 (file)
--- a/vp8/encoder/modecosts.c
+++ b/vp8/encoder/modecosts.c
@@ -40,8 +40,11 @@ void vp8_init_mode_costs(VP8_COMP *c)
     vp8_cost_tokens((int *)c->mb.inter_bmode_costs, x->fc.sub_mv_ref_prob, vp8_sub_mv_ref_tree);
 
     vp8_cost_tokens(c->mb.mbmode_cost[1], x->fc.ymode_prob, vp8_ymode_tree);
+#if CONFIG_QIMODE
+    vp8_cost_tokens(c->mb.mbmode_cost[0], x->kf_ymode_prob[c->common.base_qindex>>4], vp8_kf_ymode_tree);
+#else
     vp8_cost_tokens(c->mb.mbmode_cost[0], x->kf_ymode_prob, vp8_kf_ymode_tree);
-
+#endif
     vp8_cost_tokens(c->mb.intra_uv_mode_cost[1], x->fc.uv_mode_prob, vp8_uv_mode_tree);
     vp8_cost_tokens(c->mb.intra_uv_mode_cost[0], x->kf_uv_mode_prob, vp8_uv_mode_tree);
 #if CONFIG_I8X8

diff --git a/vp8/encoder/onyx_int.h b/vp8/encoder/onyx_int.h
index fd89b33010ce406fbe1a2e6f8c45f8e093ec336f..bd162cbb463d15cb48e22ce8a5a3a709d313aa0b 100644 (file)
--- a/vp8/encoder/onyx_int.h
+++ b/vp8/encoder/onyx_int.h
@@ -81,7 +81,11 @@ typedef struct
     /* interframe intra mode probs */
     vp8_prob ymode_prob[VP8_YMODES-1], uv_mode_prob[VP8_UV_MODES-1];
     /* keyframe intra mode probs */
+#if CONFIG_QIMODE
+    vp8_prob kf_ymode_prob[8][VP8_YMODES-1], kf_uv_mode_prob[VP8_UV_MODES-1];
+#else
     vp8_prob kf_ymode_prob[VP8_YMODES-1], kf_uv_mode_prob[VP8_UV_MODES-1];
+#endif
     /* intra MB type cts this frame */
     int ymode_count[VP8_YMODES], uv_mode_count[VP8_UV_MODES];
 

diff --git a/vp8/encoder/ratectrl.c b/vp8/encoder/ratectrl.c
index d6c50213c0b3737471731ad04ffadc59f08c3db1..c893b8d62f074ad14980ba9d8195391ef5236c45 100644 (file)
--- a/vp8/encoder/ratectrl.c
+++ b/vp8/encoder/ratectrl.c
@@ -321,7 +321,6 @@ void vp8_restore_coding_context(VP8_COMP *cpi)
     vp8_copy(cpi->common.fc.mvc, cc->mvc);
 
     vp8_copy(cpi->mb.mvcosts, cc->mvcosts);
-
     vp8_copy(cpi->common.kf_ymode_prob,   cc->kf_ymode_prob);
     vp8_copy(cpi->common.fc.ymode_prob,   cc->ymode_prob);
     vp8_copy(cpi->common.kf_uv_mode_prob,  cc->kf_uv_mode_prob);