Enable altref2 by default and merge it into ext-refs
Change-Id: Ie67266538db41c6aa7d79a5c270c26c021583c48
diff --git a/av1/encoder/rd.c b/av1/encoder/rd.c
index c30506a..8e04329 100644
--- a/av1/encoder/rd.c
+++ b/av1/encoder/rd.c
@@ -328,15 +328,11 @@
128, 144, 128, 128, 144,
#if CONFIG_EXT_REFS
// TODO(zoeliu): To adjust further following factor values.
- 128, 128, 128
+ 128, 128, 128,
// TODO(weitinglin): We should investigate if the values should be the same
// as the value used by OVERLAY frame
- ,
- 144 // INTNL_OVERLAY_UPDATE
-#if CONFIG_ALTREF2
- ,
+ 144, // INTNL_OVERLAY_UPDATE
128 // INTNL_ARF_UPDATE
-#endif // CONFIG_ALTREF2
#endif // CONFIG_EXT_REFS
};
@@ -1073,9 +1069,7 @@
rd->thresh_mult[THR_NEARESTL2] = 300;
rd->thresh_mult[THR_NEARESTL3] = 300;
rd->thresh_mult[THR_NEARESTB] = 300;
-#if CONFIG_ALTREF2
rd->thresh_mult[THR_NEARESTA2] = 300;
-#endif // CONFIG_ALTREF2
#endif // CONFIG_EXT_REFS
rd->thresh_mult[THR_NEARESTA] = 300;
rd->thresh_mult[THR_NEARESTG] = 300;
@@ -1085,9 +1079,7 @@
rd->thresh_mult[THR_NEARESTL2] = 0;
rd->thresh_mult[THR_NEARESTL3] = 0;
rd->thresh_mult[THR_NEARESTB] = 0;
-#if CONFIG_ALTREF2
rd->thresh_mult[THR_NEARESTA2] = 0;
-#endif // CONFIG_ALTREF2
#endif // CONFIG_EXT_REFS
rd->thresh_mult[THR_NEARESTA] = 0;
rd->thresh_mult[THR_NEARESTG] = 0;
@@ -1100,9 +1092,7 @@
rd->thresh_mult[THR_NEWL2] += 1000;
rd->thresh_mult[THR_NEWL3] += 1000;
rd->thresh_mult[THR_NEWB] += 1000;
-#if CONFIG_ALTREF2
rd->thresh_mult[THR_NEWA2] = 1000;
-#endif // CONFIG_ALTREF2
#endif // CONFIG_EXT_REFS
rd->thresh_mult[THR_NEWA] += 1000;
rd->thresh_mult[THR_NEWG] += 1000;
@@ -1112,9 +1102,7 @@
rd->thresh_mult[THR_NEARL2] += 1000;
rd->thresh_mult[THR_NEARL3] += 1000;
rd->thresh_mult[THR_NEARB] += 1000;
-#if CONFIG_ALTREF2
rd->thresh_mult[THR_NEARA2] = 1000;
-#endif // CONFIG_ALTREF2
#endif // CONFIG_EXT_REFS
rd->thresh_mult[THR_NEARA] += 1000;
rd->thresh_mult[THR_NEARG] += 1000;
@@ -1124,9 +1112,7 @@
rd->thresh_mult[THR_ZEROL2] += 2000;
rd->thresh_mult[THR_ZEROL3] += 2000;
rd->thresh_mult[THR_ZEROB] += 2000;
-#if CONFIG_ALTREF2
rd->thresh_mult[THR_ZEROA2] = 2000;
-#endif // CONFIG_ALTREF2
#endif // CONFIG_EXT_REFS
rd->thresh_mult[THR_ZEROG] += 2000;
rd->thresh_mult[THR_ZEROA] += 2000;
@@ -1194,12 +1180,10 @@
rd->thresh_mult[THR_COMP_NEAREST_NEARESTL2B] += 1000;
rd->thresh_mult[THR_COMP_NEAREST_NEARESTL3B] += 1000;
rd->thresh_mult[THR_COMP_NEAREST_NEARESTGB] += 1000;
-#if CONFIG_ALTREF2
rd->thresh_mult[THR_COMP_NEAREST_NEARESTLA2] += 1000;
rd->thresh_mult[THR_COMP_NEAREST_NEARESTL2A2] += 1000;
rd->thresh_mult[THR_COMP_NEAREST_NEARESTL3A2] += 1000;
rd->thresh_mult[THR_COMP_NEAREST_NEARESTGA2] += 1000;
-#endif // CONFIG_ALTREF2
#if CONFIG_EXT_COMP_REFS
rd->thresh_mult[THR_COMP_NEAREST_NEARESTLL2] += 1000;
@@ -1222,12 +1206,10 @@
rd->thresh_mult[THR_COMP_NEARESTL2B] += 1000;
rd->thresh_mult[THR_COMP_NEARESTL3B] += 1000;
rd->thresh_mult[THR_COMP_NEARESTGB] += 1000;
-#if CONFIG_ALTREF2
rd->thresh_mult[THR_COMP_NEARESTLA2] += 1000;
rd->thresh_mult[THR_COMP_NEARESTL2A2] += 1000;
rd->thresh_mult[THR_COMP_NEARESTL3A2] += 1000;
rd->thresh_mult[THR_COMP_NEARESTGA2] += 1000;
-#endif // CONFIG_ALTREF2
#if CONFIG_EXT_COMP_REFS
rd->thresh_mult[THR_COMP_NEARESTLL2] += 1000;
@@ -1308,7 +1290,6 @@
rd->thresh_mult[THR_COMP_NEW_NEWGB] += 2000;
rd->thresh_mult[THR_COMP_ZERO_ZEROGB] += 2500;
-#if CONFIG_ALTREF2
rd->thresh_mult[THR_COMP_NEAR_NEARLA2] += 1200;
rd->thresh_mult[THR_COMP_NEAREST_NEWLA2] += 1500;
rd->thresh_mult[THR_COMP_NEW_NEARESTLA2] += 1500;
@@ -1340,7 +1321,6 @@
rd->thresh_mult[THR_COMP_NEW_NEARGA2] += 1700;
rd->thresh_mult[THR_COMP_NEW_NEWGA2] += 2000;
rd->thresh_mult[THR_COMP_ZERO_ZEROGA2] += 2500;
-#endif // CONFIG_ALTREF2
#if CONFIG_EXT_COMP_REFS
rd->thresh_mult[THR_COMP_NEAR_NEARLL2] += 1200;
@@ -1400,7 +1380,6 @@
rd->thresh_mult[THR_COMP_NEARGB] += 1500;
rd->thresh_mult[THR_COMP_NEWGB] += 2000;
-#if CONFIG_ALTREF2
rd->thresh_mult[THR_COMP_NEARLA2] += 1500;
rd->thresh_mult[THR_COMP_NEWLA2] += 2000;
rd->thresh_mult[THR_COMP_NEARL2A2] += 1500;
@@ -1409,7 +1388,6 @@
rd->thresh_mult[THR_COMP_NEWL3A2] += 2000;
rd->thresh_mult[THR_COMP_NEARGA2] += 1500;
rd->thresh_mult[THR_COMP_NEWGA2] += 2000;
-#endif // CONFIG_ALTREF2
#if CONFIG_EXT_COMP_REFS
rd->thresh_mult[THR_COMP_NEARLL2] += 1500;
@@ -1436,12 +1414,10 @@
rd->thresh_mult[THR_COMP_ZEROL3B] += 2500;
rd->thresh_mult[THR_COMP_ZEROGB] += 2500;
-#if CONFIG_ALTREF2
rd->thresh_mult[THR_COMP_ZEROLA2] += 2500;
rd->thresh_mult[THR_COMP_ZEROL2A2] += 2500;
rd->thresh_mult[THR_COMP_ZEROL3A2] += 2500;
rd->thresh_mult[THR_COMP_ZEROGA2] += 2500;
-#endif // CONFIG_ALTREF2
#if CONFIG_EXT_COMP_REFS
rd->thresh_mult[THR_COMP_ZEROLL2] += 2500;
@@ -1491,12 +1467,10 @@
rd->thresh_mult[THR_COMP_INTERINTRA_NEARB] += 1500;
rd->thresh_mult[THR_COMP_INTERINTRA_NEWB] += 2000;
-#if CONFIG_ALTREF2
rd->thresh_mult[THR_COMP_INTERINTRA_ZEROA2] += 1500;
rd->thresh_mult[THR_COMP_INTERINTRA_NEARESTA2] += 1500;
rd->thresh_mult[THR_COMP_INTERINTRA_NEARA2] += 1500;
rd->thresh_mult[THR_COMP_INTERINTRA_NEWA2] += 2000;
-#endif // CONFIG_ALTREF2
#endif // CONFIG_EXT_REFS
rd->thresh_mult[THR_COMP_INTERINTRA_ZEROA] += 1500;
@@ -1513,9 +1487,7 @@
2500,
2500,
2500,
-#if CONFIG_ALTREF2
2500,
-#endif // CONFIG_ALTREF2
2500,
2500,
4500,
@@ -1526,12 +1498,10 @@
4500,
4500,
4500,
-#if CONFIG_ALTREF2
4500,
4500,
4500,
4500,
-#endif // CONFIG_ALTREF2
2500
#else // !CONFIG_EXT_REFS
2500,
