Ticket #54: 54Patch.3.patch

TComRom.cpp

@@ -73 +73 @@
 
 #if HHI_TRANSFORM_CODING
   // init adaptive scan for sig/last SE coding
+#if BUGFIX54
+  for ( i = 0; i < MAX_CU_DEPTH+1; i++ )
+#else
   for ( i = 0; i < MAX_CU_DEPTH; i++ )
+#endif
   {
     const int   iBlockSize    = 1 << i;
     const UInt  uiNumScanPos  = UInt( iBlockSize * iBlockSize );
@@ -2283 +2287 @@
 UInt* g_auiFrameScanY [ MAX_CU_DEPTH  ];
 
 #if HHI_TRANSFORM_CODING
+#if BUGFIX54
+UInt* g_auiSigLastScan[ MAX_CU_DEPTH+1 ][ 2 ];
+#else
 UInt* g_auiSigLastScan[ MAX_CU_DEPTH  ][ 2 ];
 #endif
+#endif
 
 // scanning order to 8x8 context model mapping table
 UInt  g_auiAntiScan8  [64];

TComRom.h

@@ -47 +47 @@
 // Macros
 // ====================================================================================================================
 
-#define     MAX_CU_DEPTH            7                           // log2(LCUSize)
+#define     MAX_CU_DEPTH            6                           // log2(LCUSize)
 #define     MAX_CU_SIZE             (1<<(MAX_CU_DEPTH))         // maximum allowable size of CU
 #define     MIN_PU_SIZE             4
 #define     MAX_NUM_SPU_W           (MAX_CU_SIZE/MIN_PU_SIZE)   // maximum number of SPU in horizontal line
@@ -166 +166 @@
 
 #endif
 #if HHI_TRANSFORM_CODING
+#if BUGFIX54
+extern       UInt*  g_auiSigLastScan[ MAX_CU_DEPTH+1 ][ 2 ];
+#else
 extern       UInt*  g_auiSigLastScan[ MAX_CU_DEPTH  ][ 2 ];
 #endif
+#endif
 
 // ====================================================================================================================
 // CAVLC table

TypeDef.h

@@ -58 +58 @@
 #define HHI_AMVP_OFF                      0           ///< SOPH: Advanced Motion Vector Predictor deactivated [not in TMuC]
 #define HHI_DEBLOCKING_FILTER             0           ///< MW: deblocking filter supporting residual quadtrees
 
+#define BUGFIX54                          1
+
 #if ( HHI_RQT_INTRA && !HHI_RQT )
 #error "HHI_RQT_INTRA can only be equal to 1 if HHI_RQT is equal to 1"
 #endif