generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed #if CONFIG_I8X8

Browse Source 
This commit removed the macro CONFIG_I8X8, which was used to indicate
the 8x8 intra prediction experiment, made the change fully merged in.

Change-Id: Iafa4443781ce6e83f5591c12ba615a0e92ce0ea0
This commit is contained in:
Yaowu Xu
2011-12-07 13:03:57 -08:00
parent 76feb965d3
commit d37cd97682
27 changed files with 61 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
vp8/encoder/onyx_int.h
View File

@@ -43,9 +43,9 @@
#define AF_THRESH2 100
#define ARF_DECAY_THRESH 12
#if CONFIG_DUALPRED
#define MAX_MODES (32 + CONFIG_I8X8)
#define MAX_MODES 33
#else /* CONFIG_DUALPRED */
#define MAX_MODES (20 + CONFIG_I8X8)
#define MAX_MODES 21
#endif /* CONFIG_DUALPRED */
#define MIN_THRESHMULT 32
@@ -190,26 +190,24 @@ typedef enum
THR_SPLITA = 18,
THR_B_PRED = 19,
#if CONFIG_I8X8
THR_I8X8_PRED = 20,
#endif
#if CONFIG_DUALPRED
THR_DUAL_ZEROLG = 20 + CONFIG_I8X8,
THR_DUAL_NEARESTLG = 21 + CONFIG_I8X8,
THR_DUAL_NEARLG = 22 + CONFIG_I8X8,
THR_DUAL_ZEROLG = 21,
THR_DUAL_NEARESTLG = 22,
THR_DUAL_NEARLG = 23,
THR_DUAL_ZEROLA = 23 + CONFIG_I8X8,
THR_DUAL_NEARESTLA = 24 + CONFIG_I8X8,
THR_DUAL_NEARLA = 25 + CONFIG_I8X8,
THR_DUAL_ZEROLA = 24,
THR_DUAL_NEARESTLA = 25,
THR_DUAL_NEARLA = 26,
THR_DUAL_ZEROGA = 26 + CONFIG_I8X8,
THR_DUAL_NEARESTGA = 27 + CONFIG_I8X8,
THR_DUAL_NEARGA = 28 + CONFIG_I8X8,
THR_DUAL_ZEROGA = 27,
THR_DUAL_NEARESTGA = 28,
THR_DUAL_NEARGA = 29,
THR_DUAL_NEWLG = 29 + CONFIG_I8X8,
THR_DUAL_NEWLA = 30 + CONFIG_I8X8,
THR_DUAL_NEWGA = 31 + CONFIG_I8X8,
THR_DUAL_NEWLG = 30,
THR_DUAL_NEWLA = 31,
THR_DUAL_NEWGA = 32,
#endif /* CONFIG_DUALPRED */
}
THR_MODES;