Changeset 792 in 3DVCSoftware for branches/HTM-9.3-dev3-Samsung/source/Lib/TLibCommon/TComDataCU.cpp

Timestamp:

23 Jan 2014, 05:06:49 (10 years ago)

Author:

samsung-htm

Message:

Integration of JCT3V-G0101: InterSDC with multiple DC candidates

File:

• branches/HTM-9.3-dev3-Samsung/source/Lib/TLibCommon/TComDataCU.cpp (modified) (16 diffs)

branches/HTM-9.3-dev3-Samsung/source/Lib/TLibCommon/TComDataCU.cpp

@@ -123 +123 @@
 #if H_3D_DIM_SDC
   m_pbSDCFlag             = NULL;
-#if QC_SDC_UNIFY_G0130
+#if QC_SDC_UNIFY_G0130 && !SEC_INTER_SDC_G0101
   for( Int i = 0; i < 4; i++ )
   {
@@ -160 +160 @@
   }
 #endif
+#if !SEC_INTER_SDC_G0101
   m_pucInterSDCMask       = NULL;
+#endif
 #endif
 }
@@ -281 +283 @@
 #if H_3D_DIM_SDC
     m_pbSDCFlag             = (Bool*)xMalloc(Bool, uiNumPartition);
-#if QC_SDC_UNIFY_G0130
+#if QC_SDC_UNIFY_G0130 && !SEC_INTER_SDC_G0101
     for( Int i = 0; i < 4; i++ )
     {
@@ -305 +307 @@
     m_acCUMvField[1].setNumPartition(uiNumPartition );
   }
+#if !SEC_INTER_SDC_G0101
 #if H_3D_INTER_SDC
   m_pucInterSDCMask     = (UChar*  )xMalloc(UChar,    g_uiMaxCUHeight*g_uiMaxCUWidth);
+#endif
 #endif
   m_sliceStartCU        = (UInt*  )xMalloc(UInt, uiNumPartition);
@@ -416 +420 @@
 #if H_3D_DIM_SDC
     if ( m_pbSDCFlag            ) { xFree(m_pbSDCFlag);             m_pbSDCFlag             = NULL; }
-#if QC_SDC_UNIFY_G0130
+#if QC_SDC_UNIFY_G0130 && !SEC_INTER_SDC_G0101
     for( Int i = 0; i < 4; i++ )
     {
@@ -435 +439 @@
 #endif
   }
+#if !SEC_INTER_SDC_G0101
 #if H_3D_INTER_SDC
   if ( m_pucInterSDCMask     ) { xFree(m_pucInterSDCMask);      m_pucInterSDCMask    = NULL; }
+#endif
 #endif
   m_pcCUAboveLeft       = NULL;
@@ -639 +645 @@
 #if H_3D_DIM_SDC
     memset( m_pbSDCFlag             + firstElement,     0,                numElements * sizeof( *m_pbSDCFlag            ) );
-#if QC_SDC_UNIFY_G0130
+#if QC_SDC_UNIFY_G0130 && !SEC_INTER_SDC_G0101
     for( Int i = 0; i < 4; i++ )
     {
@@ -818 +824 @@
 #if H_3D_DIM_SDC
       m_pbSDCFlag           [ui] = false;
-#if QC_SDC_UNIFY_G0130
+#if QC_SDC_UNIFY_G0130 && !SEC_INTER_SDC_G0101
       for( Int i = 0; i < 4; i++ )
       {
@@ -938 +944 @@
 #if H_3D_DIM_SDC
   memset( m_pbSDCFlag,            0, sizeof(Bool) * m_uiNumPartition  );
-#if QC_SDC_UNIFY_G0130
+#if QC_SDC_UNIFY_G0130 && !SEC_INTER_SDC_G0101
   for( Int i = 0; i < 4; i++ )
   {
@@ -1022 +1028 @@
 #if H_3D_DIM_SDC
       m_pbSDCFlag           [ui] = pcCU->m_pbSDCFlag            [ uiPartOffset + ui ];
-#if QC_SDC_UNIFY_G0130
+#if QC_SDC_UNIFY_G0130 && !SEC_INTER_SDC_G0101
       for( Int i = 0; i < 4; i++ )
       {
@@ -1185 +1191 @@
 #if H_3D_DIM_SDC
   m_pbSDCFlag               = pcCU->getSDCFlag()              + uiPart;
-#if QC_SDC_UNIFY_G0130
+#if QC_SDC_UNIFY_G0130 && !SEC_INTER_SDC_G0101
   for( Int i = 0; i < 4; i++ )
   {
@@ -1386 +1392 @@
 #if H_3D_DIM_SDC
   memcpy( m_pbSDCFlag             + uiOffset, pcCU->getSDCFlag(),             iSizeInBool  );
-#if QC_SDC_UNIFY_G0130
+#if QC_SDC_UNIFY_G0130 && !SEC_INTER_SDC_G0101
   for( Int i = 0; i < 4; i++ )
   {
@@ -1515 +1521 @@
 #if H_3D_DIM_SDC
   memcpy( rpcCU->getSDCFlag()             + m_uiAbsIdxInLCU, m_pbSDCFlag,      iSizeInBool  );
-#if QC_SDC_UNIFY_G0130
+#if QC_SDC_UNIFY_G0130 && !SEC_INTER_SDC_G0101
   for( Int i = 0; i < 4; i++ )
   {
@@ -1630 +1636 @@
 #if H_3D_DIM_SDC
   memcpy( rpcCU->getSDCFlag()             + uiPartOffset, m_pbSDCFlag,      iSizeInBool  );
-#if QC_SDC_UNIFY_G0130
+#if QC_SDC_UNIFY_G0130 && !SEC_INTER_SDC_G0101
   for( Int i = 0; i < 4; i++ )
   {
@@ -2384 +2390 @@
 #endif
 
+#if !SEC_INTER_SDC_G0101
 Void TComDataCU::xSetInterSDCCUMask( TComDataCU *pcCU, UChar *pMask )
 {
@@ -2480 +2487 @@
 
 }
+#endif
 #endif