More renaming about directional intra modes

Some leftover from 69ae7b8.

Change-Id: I4c37538fe8e13761631bd9521e954af0730c4e0b

av1/common/blockd.h

diff --git a/av1/common/blockd.h b/av1/common/blockd.h
index 30efed7..a3b9ff1 100644
--- a/av1/common/blockd.h
+++ b/av1/common/blockd.h
@@ -91,10 +91,10 @@
     MB_MODE_COUNT,  // H_PRED
     MB_MODE_COUNT,  // D45_PRED
     MB_MODE_COUNT,  // D135_PRED
-    MB_MODE_COUNT,  // D117_PRED
-    MB_MODE_COUNT,  // D153_PRED
-    MB_MODE_COUNT,  // D207_PRED
-    MB_MODE_COUNT,  // D63_PRED
+    MB_MODE_COUNT,  // D113_PRED
+    MB_MODE_COUNT,  // D157_PRED
+    MB_MODE_COUNT,  // D203_PRED
+    MB_MODE_COUNT,  // D67_PRED
     MB_MODE_COUNT,  // SMOOTH_PRED
     MB_MODE_COUNT,  // SMOOTH_V_PRED
     MB_MODE_COUNT,  // SMOOTH_H_PRED
@@ -124,10 +124,10 @@
     MB_MODE_COUNT,  // H_PRED
     MB_MODE_COUNT,  // D45_PRED
     MB_MODE_COUNT,  // D135_PRED
-    MB_MODE_COUNT,  // D117_PRED
-    MB_MODE_COUNT,  // D153_PRED
-    MB_MODE_COUNT,  // D207_PRED
-    MB_MODE_COUNT,  // D63_PRED
+    MB_MODE_COUNT,  // D113_PRED
+    MB_MODE_COUNT,  // D157_PRED
+    MB_MODE_COUNT,  // D203_PRED
+    MB_MODE_COUNT,  // D67_PRED
     MB_MODE_COUNT,  // SMOOTH_PRED
     MB_MODE_COUNT,  // SMOOTH_V_PRED
     MB_MODE_COUNT,  // SMOOTH_H_PRED

av1/common/enums.h

diff --git a/av1/common/enums.h b/av1/common/enums.h
index 447d65c..34d5273 100644
--- a/av1/common/enums.h
+++ b/av1/common/enums.h
@@ -428,7 +428,7 @@
   PALETTE_COLORS
 } PALETTE_COLOR;
 
-// Note: All directional predictors must be between V_PRED and D63_PRED (both
+// Note: All directional predictors must be between V_PRED and D67_PRED (both
 // inclusive).
 typedef enum ATTRIBUTE_PACKED {
   DC_PRED,        // Average of above and left pixels

av1/common/mvref_common.h

diff --git a/av1/common/mvref_common.h b/av1/common/mvref_common.h
index 4fe4f84..6429bab 100644
--- a/av1/common/mvref_common.h
+++ b/av1/common/mvref_common.h
@@ -59,10 +59,10 @@
   9,  // H_PRED
   9,  // D45_PRED
   9,  // D135_PRED
-  9,  // D117_PRED
-  9,  // D153_PRED
-  9,  // D207_PRED
-  9,  // D63_PRED
+  9,  // D113_PRED
+  9,  // D157_PRED
+  9,  // D203_PRED
+  9,  // D67_PRED
   9,  // SMOOTH_PRED
   9,  // SMOOTH_V_PRED
   9,  // SMOOTH_H_PRED

av1/encoder/encodeframe.c

diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index a51c9a4..e40975d 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -541,10 +541,10 @@
         THR_H_PRED /*H_PRED*/,
         THR_D45_PRED /*D45_PRED*/,
         THR_D135_PRED /*D135_PRED*/,
-        THR_D117_PRED /*D117_PRED*/,
-        THR_D153_PRED /*D153_PRED*/,
-        THR_D207_PRED /*D207_PRED*/,
-        THR_D63_PRED /*D63_PRED*/,
+        THR_D113_PRED /*D113_PRED*/,
+        THR_D157_PRED /*D157_PRED*/,
+        THR_D203_PRED /*D203_PRED*/,
+        THR_D67_PRED /*D67_PRED*/,
         THR_SMOOTH,   /*SMOOTH_PRED*/
         THR_SMOOTH_V, /*SMOOTH_V_PRED*/
         THR_SMOOTH_H, /*SMOOTH_H_PRED*/

av1/encoder/rd.c

diff --git a/av1/encoder/rd.c b/av1/encoder/rd.c
index 2f40dbb..327e0e5 100644
--- a/av1/encoder/rd.c
+++ b/av1/encoder/rd.c
@@ -1171,10 +1171,10 @@
   rd->thresh_mult[THR_H_PRED] += 2000;
   rd->thresh_mult[THR_V_PRED] += 2000;
   rd->thresh_mult[THR_D135_PRED] += 2500;
-  rd->thresh_mult[THR_D207_PRED] += 2500;
-  rd->thresh_mult[THR_D153_PRED] += 2500;
-  rd->thresh_mult[THR_D63_PRED] += 2500;
-  rd->thresh_mult[THR_D117_PRED] += 2500;
+  rd->thresh_mult[THR_D203_PRED] += 2500;
+  rd->thresh_mult[THR_D157_PRED] += 2500;
+  rd->thresh_mult[THR_D67_PRED] += 2500;
+  rd->thresh_mult[THR_D113_PRED] += 2500;
   rd->thresh_mult[THR_D45_PRED] += 2500;
 
 #if CONFIG_EXT_COMP_REFS

av1/encoder/rd.h

diff --git a/av1/encoder/rd.h b/av1/encoder/rd.h
index 3cfcc96..36f7f6d 100644
--- a/av1/encoder/rd.h
+++ b/av1/encoder/rd.h
@@ -204,10 +204,10 @@
   THR_H_PRED,
   THR_V_PRED,
   THR_D135_PRED,
-  THR_D207_PRED,
-  THR_D153_PRED,
-  THR_D63_PRED,
-  THR_D117_PRED,
+  THR_D203_PRED,
+  THR_D157_PRED,
+  THR_D67_PRED,
+  THR_D113_PRED,
   THR_D45_PRED,
 
 #if CONFIG_EXT_COMP_REFS

test/test_intra_pred_speed.cc

diff --git a/test/test_intra_pred_speed.cc b/test/test_intra_pred_speed.cc
index 6dd3ce7..aec6b16 100644
--- a/test/test_intra_pred_speed.cc
+++ b/test/test_intra_pred_speed.cc
@@ -37,7 +37,7 @@
 const char *kAv1IntraPredNames[kNumAv1IntraFuncs] = {
   "DC_PRED",    "DC_LEFT_PRED", "DC_TOP_PRED",   "DC_128_PRED",
   "V_PRED",     "H_PRED",       "D45_PRED",      "D135_PRED",
-  "D117_PRED",  "D153_PRED",    "D207_PRED",     "D63_PRED",
+  "D113_PRED",  "D157_PRED",    "D203_PRED",     "D67_PRED",
   "PAETH_PRED", "SMOOTH_PRED",  "SMOOTH_V_PRED", "SMOOTH_H_PRED",
 };