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

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.h (modified) (1 diff)

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

@@ -171 +171 @@
 #endif
 #if TEMP_SDC_CLEANUP // PM: consider this cleanup for SDC
-#if NH_3D_INTRA_SDC
+#if NH_3D_SDC_INTRA
   Void predConstantSDC            ( Pel* ptrSrc, UInt srcStride, UInt uiSize, Pel& predDC );
 #endif
 #else // PM: should be obsolete after cleanup
-#if NH_3D_INTRA_SDC
+#if NH_3D_SDC_INTRA
   Void analyzeSegmentsSDC         ( Pel* pOrig, UInt uiStride, UInt uiSize, Pel* rpSegMeans, UInt uiNumSegments, Bool* pMask, UInt uiMaskStride, UInt uiIntraMode, Bool orgDC=false );
 #endif