Fixed a bug on the number of MAX_MODES in baseline

All the numbers of MAX_MODES have been changed assuming
CONFIG_MULTI_REF. Now correct numbers have been put in for both with and
without the enabling of the experiment MULTI_REF.

Change-Id: I70ffe2f1a89fa572d612dd3d311d3af19fe3a632

diff --git a/vp9/encoder/vp9_rd.h b/vp9/encoder/vp9_rd.h
index d2330cff7582c0579ef5a8200d14a277fe860f1d..4da1d67276e9a3913bf9675ae103f2b03d9a9be0 100644 (file)
--- a/vp9/encoder/vp9_rd.h
+++ b/vp9/encoder/vp9_rd.h
@@ -37,6 +37,8 @@ extern "C" {
 
 #define INVALID_MV 0x80008000
 
+#if CONFIG_MULTI_REF
+
 #if CONFIG_NEW_INTER
 
 #if CONFIG_INTERINTRA
@@ -55,6 +57,28 @@ extern "C" {
 
 #endif  // CONFIG_NEW_INTER
 
+#else  // CONFIG_MULTI_REF
+
+#if CONFIG_NEW_INTER
+
+#if CONFIG_INTERINTRA
+#define MAX_MODES 55
+#else  // CONFIG_INTERINTRA
+#define MAX_MODES 43
+#endif  // CONFIG_INTERINTRA
+
+#else   // CONFIG_NEW_INTER
+
+#if CONFIG_INTERINTRA
+#define MAX_MODES 42
+#else  // CONFIG_INTERINTRA
+#define MAX_MODES 30
+#endif  // CONFIG_INTERINTRA
+
+#endif  // CONFIG_NEW_INTER
+
+#endif  // CONFIG_MULTI_REF
+
 #if CONFIG_MULTI_REF
 #define MAX_REFS  8
 #else