Changeset 655 in 3DVCSoftware for trunk/source/Lib/TLibDecoder/TDecCu.cpp

Timestamp:

23 Oct 2013, 23:01:30 (11 years ago)

Author:

tech

Message:

Merged 8.1-Cleanup@654

File:

• trunk/source/Lib/TLibDecoder/TDecCu.cpp (modified) (5 diffs)

trunk/source/Lib/TLibDecoder/TDecCu.cpp

@@ -458 +458 @@
   m_pcEntropyDecoder->decodeARPW    ( pcCU , uiAbsPartIdx , uiDepth );  
 #endif  
-#if LGE_INTER_SDC_E0156
+#if H_3D_INTER_SDC
   m_pcEntropyDecoder->decodeInterSDCFlag( pcCU, uiAbsPartIdx, uiDepth );
 #endif
@@ -525 +525 @@
   {
     case MODE_INTER:
-#if LGE_INTER_SDC_E0156
+#if H_3D_INTER_SDC
       if( m_ppcCU[uiDepth]->getInterSDCFlag( 0 ) )
       {
@@ -534 +534 @@
 #endif
       xReconInter( m_ppcCU[uiDepth], uiDepth );
-#if LGE_INTER_SDC_E0156
+#if H_3D_INTER_SDC
       }
 #endif
@@ -578 +578 @@
 }
 
-#if LGE_INTER_SDC_E0156
+#if H_3D_INTER_SDC
 Void TDecCu::xReconInterSDC( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth )
 {
@@ -895 +895 @@
   // get DC prediction for each segment
   Pel apDCPredValues[2];
-#if KWU_SDC_SIMPLE_DC_E0117
   m_pcPrediction->analyzeSegmentsSDC(piPred, uiStride, uiWidth, apDCPredValues, uiNumSegments, pbMask, uiMaskStride, uiLumaPredMode);
-#else
-  m_pcPrediction->analyzeSegmentsSDC(piPred, uiStride, uiWidth, apDCPredValues, uiNumSegments, pbMask, uiMaskStride);
-#endif
   
   // reconstruct residual based on mask + DC residuals