diff options
| author | Yaowu Xu <yaowu@google.com> | 2012-04-25 08:47:33 -0700 |
|---|---|---|
| committer | Yaowu Xu <yaowu@google.com> | 2012-04-25 14:18:25 -0700 |
| commit | a16608aba040957e269ec1e7905c72140cb721b6 (patch) | |
| tree | ba370e24063c2ed2f39eb1065e27257854898aaf /vp8/common/entropymode.c | |
| parent | c1814d267a8a713fd781e6f938d37b717786cf7a (diff) | |
| download | libvpx-a16608aba040957e269ec1e7905c72140cb721b6.tar libvpx-a16608aba040957e269ec1e7905c72140cb721b6.tar.gz libvpx-a16608aba040957e269ec1e7905c72140cb721b6.tar.bz2 libvpx-a16608aba040957e269ec1e7905c72140cb721b6.zip | |
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
Diffstat (limited to 'vp8/common/entropymode.c')
| -rw-r--r-- | vp8/common/entropymode.c | 13 |
1 files changed, 0 insertions, 13 deletions
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++) |