Changeset 612 in 3DVCSoftware for branches/HTM-8.0-dev0/source/Lib/TLibCommon/TComDataCU.cpp

Timestamp:

3 Sep 2013, 17:46:48 (12 years ago)

Author:

hhi

Message:

SEC_DMM2_E0146_HHIFIX: Fix for SEC_DMM2_E0146, now including all DMM2 related code.

File:

• branches/HTM-8.0-dev0/source/Lib/TLibCommon/TComDataCU.cpp (modified) (12 diffs)

branches/HTM-8.0-dev0/source/Lib/TLibCommon/TComDataCU.cpp

@@ -120 +120 @@
     m_dmmWedgeTabIdx[i] = NULL;
   }
-#if !SEC_DMM2_E0146
+#if !SEC_DMM2_E0146_HHIFIX
   m_dmm2DeltaEnd    = NULL;
 #endif
@@ -280 +280 @@
       m_dmmWedgeTabIdx[i]    = (UInt*)xMalloc(UInt, uiNumPartition);
     }
-#if !SEC_DMM2_E0146
+#if !SEC_DMM2_E0146_HHIFIX
     m_dmm2DeltaEnd    = (Int* )xMalloc(Int,  uiNumPartition);
 #endif
@@ -419 +419 @@
       if ( m_dmmWedgeTabIdx[i] ) { xFree( m_dmmWedgeTabIdx[i] ); m_dmmWedgeTabIdx[i] = NULL; }
     }
-#if !SEC_DMM2_E0146
+#if !SEC_DMM2_E0146_HHIFIX
     if ( m_dmm2DeltaEnd    ) { xFree( m_dmm2DeltaEnd    ); m_dmm2DeltaEnd    = NULL; }
 #endif
@@ -646 +646 @@
       memset( m_dmmWedgeTabIdx[i] + firstElement, 0,                      numElements * sizeof( *m_dmmWedgeTabIdx[i] ) );
     }
-#if !SEC_DMM2_E0146
+#if !SEC_DMM2_E0146_HHIFIX
     memset( m_dmm2DeltaEnd      + firstElement, 0,                        numElements * sizeof( *m_dmm2DeltaEnd    ) );
 #endif
@@ -829 +829 @@
         m_dmmWedgeTabIdx[i] [ui] = 0;
       }
-#if !SEC_DMM2_E0146
+#if !SEC_DMM2_E0146_HHIFIX
       m_dmm2DeltaEnd    [ui] = 0;
 #endif
@@ -946 +946 @@
     memset( m_dmmWedgeTabIdx[i], 0, sizeof(UInt) * m_uiNumPartition );
   }
-#if !SEC_DMM2_E0146
+#if !SEC_DMM2_E0146_HHIFIX
   memset( m_dmm2DeltaEnd   , 0, sizeof(Int ) * m_uiNumPartition );
 #endif
@@ -1036 +1036 @@
         m_dmmWedgeTabIdx[i] [ui] = pcCU->m_dmmWedgeTabIdx[i] [uiPartOffset+ui];
       }
-#if !SEC_DMM2_E0146
+#if !SEC_DMM2_E0146_HHIFIX
       m_dmm2DeltaEnd    [ui] = pcCU->m_dmm2DeltaEnd   [uiPartOffset+ui];
 #endif
@@ -1196 +1196 @@
     m_dmmWedgeTabIdx[i] = pcCU->getDmmWedgeTabIdx( i ) + uiPart;
   }
-#if !SEC_DMM2_E0146
+#if !SEC_DMM2_E0146_HHIFIX
   m_dmm2DeltaEnd    = pcCU->getDmm2DeltaEnd()    + uiPart;
 #endif
@@ -1404 +1404 @@
     memcpy( m_dmmWedgeTabIdx[i] + uiOffset, pcCU->getDmmWedgeTabIdx( i ), sizeof(UInt) * uiNumPartition );
   }
-#if !SEC_DMM2_E0146
+#if !SEC_DMM2_E0146_HHIFIX
   memcpy( m_dmm2DeltaEnd    + uiOffset, pcCU->getDmm2DeltaEnd()   , sizeof(Int ) * uiNumPartition );
 #endif
@@ -1539 +1539 @@
     memcpy( rpcCU->getDmmWedgeTabIdx( i ) + m_uiAbsIdxInLCU, m_dmmWedgeTabIdx[i], sizeof(UInt) * m_uiNumPartition );
   }
-#if !SEC_DMM2_E0146
+#if !SEC_DMM2_E0146_HHIFIX
   memcpy( rpcCU->getDmm2DeltaEnd()    + m_uiAbsIdxInLCU, m_dmm2DeltaEnd   , sizeof(Int ) * m_uiNumPartition );
 #endif
@@ -1658 +1658 @@
     memcpy( rpcCU->getDmmWedgeTabIdx( i ) + uiPartOffset, m_dmmWedgeTabIdx[i], sizeof(UInt) * uiQNumPart );
   }
-#if !SEC_DMM2_E0146
+#if !SEC_DMM2_E0146_HHIFIX
   memcpy( rpcCU->getDmm2DeltaEnd()    + uiPartOffset, m_dmm2DeltaEnd   , sizeof(Int ) * uiQNumPart );
 #endif
@@ -6406 +6406 @@
   for( UInt ui = 0; ui < uiCurrPartNumb; ui++ ) { m_dmmWedgeTabIdx[dmmType][uiAbsPartIdx+ui] = tabIdx; }
 }
-#if !SEC_DMM2_E0146
+#if !SEC_DMM2_E0146_HHIFIX
 Void  TComDataCU::setDmm2DeltaEndSubParts( Int iDelta, UInt uiAbsPartIdx, UInt uiDepth )
 {