From 0072b8bc730b0b4ba9e9cda08723f486247c5a3d Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Tue, 6 Dec 2011 15:13:11 -0800 Subject: [PATCH] Fix for RD thresholds if both I8X8 and DUALPRED are enabled. Change-Id: I5f9fc894e6a332d9be6d7336c7c5fe11e65b8498 --- vp8/encoder/onyx_int.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/vp8/encoder/onyx_int.h b/vp8/encoder/onyx_int.h index 74c9876..5ed58e4 100644 --- a/vp8/encoder/onyx_int.h +++ b/vp8/encoder/onyx_int.h @@ -195,21 +195,21 @@ typedef enum #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; -- 2.7.4