Ticket #54: 54Patch.3.patch
File 54Patch.3.patch, 2.4 KB (added by tung@…, 13 years ago) |
---|
-
TComRom.cpp
73 73 74 74 #if HHI_TRANSFORM_CODING 75 75 // init adaptive scan for sig/last SE coding 76 #if BUGFIX54 77 for ( i = 0; i < MAX_CU_DEPTH+1; i++ ) 78 #else 76 79 for ( i = 0; i < MAX_CU_DEPTH; i++ ) 80 #endif 77 81 { 78 82 const int iBlockSize = 1 << i; 79 83 const UInt uiNumScanPos = UInt( iBlockSize * iBlockSize ); … … 2283 2287 UInt* g_auiFrameScanY [ MAX_CU_DEPTH ]; 2284 2288 2285 2289 #if HHI_TRANSFORM_CODING 2290 #if BUGFIX54 2291 UInt* g_auiSigLastScan[ MAX_CU_DEPTH+1 ][ 2 ]; 2292 #else 2286 2293 UInt* g_auiSigLastScan[ MAX_CU_DEPTH ][ 2 ]; 2287 2294 #endif 2295 #endif 2288 2296 2289 2297 // scanning order to 8x8 context model mapping table 2290 2298 UInt g_auiAntiScan8 [64]; -
TComRom.h
47 47 // Macros 48 48 // ==================================================================================================================== 49 49 50 #define MAX_CU_DEPTH 7// log2(LCUSize)50 #define MAX_CU_DEPTH 6 // log2(LCUSize) 51 51 #define MAX_CU_SIZE (1<<(MAX_CU_DEPTH)) // maximum allowable size of CU 52 52 #define MIN_PU_SIZE 4 53 53 #define MAX_NUM_SPU_W (MAX_CU_SIZE/MIN_PU_SIZE) // maximum number of SPU in horizontal line … … 166 166 167 167 #endif 168 168 #if HHI_TRANSFORM_CODING 169 #if BUGFIX54 170 extern UInt* g_auiSigLastScan[ MAX_CU_DEPTH+1 ][ 2 ]; 171 #else 169 172 extern UInt* g_auiSigLastScan[ MAX_CU_DEPTH ][ 2 ]; 170 173 #endif 174 #endif 171 175 172 176 // ==================================================================================================================== 173 177 // CAVLC table -
TypeDef.h
58 58 #define HHI_AMVP_OFF 0 ///< SOPH: Advanced Motion Vector Predictor deactivated [not in TMuC] 59 59 #define HHI_DEBLOCKING_FILTER 0 ///< MW: deblocking filter supporting residual quadtrees 60 60 61 #define BUGFIX54 1 62 61 63 #if ( HHI_RQT_INTRA && !HHI_RQT ) 62 64 #error "HHI_RQT_INTRA can only be equal to 1 if HHI_RQT is equal to 1" 63 65 #endif