1 | Index: TComRom.cpp |
---|
2 | =================================================================== |
---|
3 | --- TComRom.cpp (revision 169) |
---|
4 | +++ TComRom.cpp (working copy) |
---|
5 | @@ -73,7 +73,11 @@ |
---|
6 | |
---|
7 | #if HHI_TRANSFORM_CODING |
---|
8 | // init adaptive scan for sig/last SE coding |
---|
9 | +#if BUGFIX54 |
---|
10 | + for ( i = 0; i < MAX_CU_DEPTH+1; i++ ) |
---|
11 | +#else |
---|
12 | for ( i = 0; i < MAX_CU_DEPTH; i++ ) |
---|
13 | +#endif |
---|
14 | { |
---|
15 | const int iBlockSize = 1 << i; |
---|
16 | const UInt uiNumScanPos = UInt( iBlockSize * iBlockSize ); |
---|
17 | @@ -83,6 +87,7 @@ |
---|
18 | initSigLastScanPattern( g_auiSigLastScan[ i ][ 0 ], i, false ); |
---|
19 | } |
---|
20 | #endif |
---|
21 | |
---|
22 | #if QC_MDDT |
---|
23 | int ipredmode; |
---|
24 | Index: TComRom.h |
---|
25 | =================================================================== |
---|
26 | --- TComRom.h (revision 169) |
---|
27 | +++ TComRom.h (working copy) |
---|
28 | @@ -47,7 +47,7 @@ |
---|
29 | // Macros |
---|
30 | // ==================================================================================================================== |
---|
31 | |
---|
32 | -#define MAX_CU_DEPTH 7 // log2(LCUSize) |
---|
33 | +#define MAX_CU_DEPTH 6 // log2(LCUSize) |
---|
34 | #define MAX_CU_SIZE (1<<(MAX_CU_DEPTH)) // maximum allowable size of CU |
---|
35 | #define MIN_PU_SIZE 4 |
---|
36 | #define MAX_NUM_SPU_W (MAX_CU_SIZE/MIN_PU_SIZE) // maximum number of SPU in horizontal line |
---|
37 | Index: TypeDef.h |
---|
38 | =================================================================== |
---|
39 | --- TypeDef.h (revision 169) |
---|
40 | +++ TypeDef.h (working copy) |
---|
41 | @@ -58,6 +58,8 @@ |
---|
42 | #define HHI_AMVP_OFF 0 ///< SOPH: Advanced Motion Vector Predictor deactivated [not in TMuC] |
---|
43 | #define HHI_DEBLOCKING_FILTER 0 ///< MW: deblocking filter supporting residual quadtrees |
---|
44 | |
---|
45 | +#define BUGFIX54 1 |
---|
46 | + |
---|
47 | #if ( HHI_RQT_INTRA && !HHI_RQT ) |
---|
48 | #error "HHI_RQT_INTRA can only be equal to 1 if HHI_RQT is equal to 1" |
---|
49 | #endif |
---|