commit f35ded4ae03cd9f3b5e8c9b2beed78da52f12bb6
author Imdad Sardharwalla <imdad.sardharwalla@argondesign.com> Mon Mar 19 14:29:28 2018 +0000
committer Debargha Mukherjee <debargha@google.com> Thu Mar 22 16:00:44 2018 +0000
tree a6c4fea0ef50d5e631676870f75e7381cc8e78b6
parent 1b2592f7c55b80dd6fde53728c19889087f5ad70

[NORMATIVE] Revert value of FRAME_OFFSET_BITS

The value of FRAME_OFFSET_BITS should not have been changed when
EXPLICIT_ORDER_HINTS was added. This patch reverts the change.

Change-Id: Id53177afdd782e6482923697f3c66669f53b32da

av1/common/enums.h

diff --git a/av1/common/enums.h b/av1/common/enums.h
index 46ffd0e..dede8bd 100644
--- a/av1/common/enums.h
+++ b/av1/common/enums.h
@@ -59,11 +59,7 @@
 // Minimum number of colors in a palette.
 #define PALETTE_MIN_SIZE 2
 
-#if CONFIG_EXPLICIT_ORDER_HINT
-#define FRAME_OFFSET_BITS 7
-#else
 #define FRAME_OFFSET_BITS 5
-#endif
 #define MAX_FRAME_DISTANCE ((1 << FRAME_OFFSET_BITS) - 1)
 
 // 4 frame filter levels: y plane vertical, y plane horizontal,

av1/common/mvref_common.c

diff --git a/av1/common/mvref_common.c b/av1/common/mvref_common.c
index a99b09c..1e2c73e 100644
--- a/av1/common/mvref_common.c
+++ b/av1/common/mvref_common.c
@@ -18,20 +18,6 @@
 
 // Although we assign 32 bit integers, all the values are strictly under 14
 // bits.
-#if CONFIG_EXPLICIT_ORDER_HINT
-static int div_mult[MAX_FRAME_DISTANCE + 1] = {
-  0,    16384, 8192, 5461, 4096, 3276, 2730, 2340, 2048, 1820, 1638, 1489, 1365,
-  1260, 1170,  1092, 1024, 963,  910,  862,  819,  780,  744,  712,  682,  655,
-  630,  606,   585,  564,  546,  528,  512,  496,  481,  468,  455,  442,  431,
-  420,  409,   399,  390,  381,  372,  364,  356,  348,  341,  334,  327,  321,
-  315,  309,   303,  297,  292,  287,  282,  277,  273,  268,  264,  260,  256,
-  252,  248,   244,  240,  237,  234,  230,  227,  224,  221,  218,  215,  212,
-  210,  207,   204,  202,  199,  197,  195,  192,  190,  188,  186,  184,  182,
-  180,  178,   176,  174,  172,  170,  168,  167,  165,  163,  162,  160,  159,
-  157,  156,   154,  153,  151,  150,  148,  147,  146,  144,  143,  142,  141,
-  140,  138,   137,  136,  135,  134,  133,  132,  131,  130,  129,
-};
-#else
 static int div_mult[64] = {
   0,    16384, 8192, 5461, 4096, 3276, 2730, 2340, 2048, 1820, 1638, 1489, 1365,
   1260, 1170,  1092, 1024, 963,  910,  862,  819,  780,  744,  712,  682,  655,
@@ -39,7 +25,6 @@
   420,  409,   399,  390,  381,  372,  364,  356,  348,  341,  334,  327,  321,
   315,  309,   303,  297,  292,  287,  282,  277,  273,  268,  264,  260,
 };
-#endif
 
 // TODO(jingning): Consider the use of lookup table for (num / den)
 // altogether.