ref: 0072b8bc730b0b4ba9e9cda08723f486247c5a3d
parent: 60cb39da860c91adc45f51f2dfa193d19598a801
author: Ronald S. Bultje <rbultje@google.com>
date: Tue Dec 6 10:13:11 EST 2011
Fix for RD thresholds if both I8X8 and DUALPRED are enabled. Change-Id: I5f9fc894e6a332d9be6d7336c7c5fe11e65b8498
--- a/vp8/encoder/onyx_int.h
+++ b/vp8/encoder/onyx_int.h
@@ -195,21 +195,21 @@
#endif
#if CONFIG_DUALPRED
- THR_DUAL_ZEROLG = 20,
- THR_DUAL_NEARESTLG = 21,
- THR_DUAL_NEARLG = 22,
+ THR_DUAL_ZEROLG = 20 + CONFIG_I8X8,
+ THR_DUAL_NEARESTLG = 21 + CONFIG_I8X8,
+ THR_DUAL_NEARLG = 22 + CONFIG_I8X8,
- THR_DUAL_ZEROLA = 23,
- THR_DUAL_NEARESTLA = 24,
- THR_DUAL_NEARLA = 25,
+ THR_DUAL_ZEROLA = 23 + CONFIG_I8X8,
+ THR_DUAL_NEARESTLA = 24 + CONFIG_I8X8,
+ THR_DUAL_NEARLA = 25 + CONFIG_I8X8,
- THR_DUAL_ZEROGA = 26,
- THR_DUAL_NEARESTGA = 27,
- THR_DUAL_NEARGA = 28,
+ THR_DUAL_ZEROGA = 26 + CONFIG_I8X8,
+ THR_DUAL_NEARESTGA = 27 + CONFIG_I8X8,
+ THR_DUAL_NEARGA = 28 + CONFIG_I8X8,
- THR_DUAL_NEWLG = 29,
- THR_DUAL_NEWLA = 30,
- THR_DUAL_NEWGA = 31,
+ THR_DUAL_NEWLG = 29 + CONFIG_I8X8,
+ THR_DUAL_NEWLA = 30 + CONFIG_I8X8,
+ THR_DUAL_NEWGA = 31 + CONFIG_I8X8,
#endif /* CONFIG_DUALPRED */
}
THR_MODES;
--
⑨