Changeset 1227 in 3DVCSoftware for branches/HTM-14.1-update-dev1-RWTH/source/Lib/TLibCommon/TComPrediction.cpp

Timestamp:

22 May 2015, 15:07:56 (9 years ago)

Author:

hhi

Message:

• SDC with DMM seems to work now (incompatible with DLT -> high level syntax problem?).
• Renamed macros for intra and inter SDC.

File:

• branches/HTM-14.1-update-dev1-RWTH/source/Lib/TLibCommon/TComPrediction.cpp (modified) (5 diffs)

branches/HTM-14.1-update-dev1-RWTH/source/Lib/TLibCommon/TComPrediction.cpp

@@ -535 +535 @@
   assert( iWidth == iHeight  );
   assert( iWidth >= DMM_MIN_SIZE && iWidth <= DMM_MAX_SIZE );
-#if NH_3D_INTRA_SDC
+#if NH_3D_SDC_INTRA
   assert( !pcCU->getSDCFlag( uiAbsPartIdx ) );
 #endif
@@ -569 +569 @@
   assignBiSegDCs( pDst, uiStride, biSegPattern, patternStride, segDC1, segDC2 );
 #if !TEMP_SDC_CLEANUP // PM: should be obsolete after cleanup
-#if NH_3D_INTRA_SDC
+#if NH_3D_SDC_INTRA
   pcCU->setDmmPredictor(segDC1, 0);
   pcCU->setDmmPredictor(segDC2, 1);
@@ -2389 +2389 @@
 
 #if TEMP_SDC_CLEANUP // PM: consider this cleanup for SDC
-#if NH_3D_INTRA_SDC
+#if NH_3D_SDC_INTRA
 Void TComPrediction::predConstantSDC( Pel* ptrSrc, UInt srcStride, UInt uiSize, Pel& predDC )
 {
@@ -2400 +2400 @@
 #endif
 #else // PM: should be obsolete after cleanup
-#if NH_3D_INTRA_SDC
+#if NH_3D_SDC_INTRA
 Void TComPrediction::analyzeSegmentsSDC( Pel* pOrig, UInt uiStride, UInt uiSize, Pel* rpSegMeans, UInt uiNumSegments, Bool* pMask, UInt uiMaskStride
                                          ,UInt uiIntraMode
@@ -2465 +2465 @@
   }
 }
-#endif // NH_3D_INTRA_SDC
+#endif // NH_3D_SDC_INTRA
 #endif