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

Timestamp:

1 Jun 2015, 18:57:12 (9 years ago)

Author:

rwth

Message:

• fixed problem when NH_3D_DMM=0
• cleaned TEMP_SDC_CLEANUP

File:

• branches/HTM-14.1-update-dev1-RWTH/source/Lib/TLibCommon/TComDataCU.h (modified) (3 diffs)

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

@@ -189 +189 @@
   Bool*         m_pbSDCFlag;
   Pel*          m_apSegmentDCOffset[2];
-#if !TEMP_SDC_CLEANUP // PM: should be obsolete after cleanup
-  Pel           m_apDmmPredictor[2];
-#endif
 #endif
 #if H_3D_DBBP
@@ -573 +570 @@
   Pel           getSDCSegmentDCOffset( UInt uiSeg, UInt uiPartIdx ) { return m_apSegmentDCOffset[uiSeg][uiPartIdx]; }
   Void          setSDCSegmentDCOffset( Pel pOffset, UInt uiSeg, UInt uiPartIdx) { m_apSegmentDCOffset[uiSeg][uiPartIdx] = pOffset; }
-#if !TEMP_SDC_CLEANUP // PM: should be obsolete after cleanup
-  Void          setDmmPredictor ( Pel pOffset, UInt uiSeg) { m_apDmmPredictor[uiSeg] = pOffset; }
-  Pel           getDmmPredictor ( UInt uiSeg) { return m_apDmmPredictor[uiSeg]; }
-#endif
 #endif
   
@@ -745 +738 @@
 
   UInt          getCoefScanIdx(const UInt uiAbsPartIdx, const UInt uiWidth, const UInt uiHeight, const ComponentID compID) const ;
-
-#if !TEMP_SDC_CLEANUP // PM: should be obsolete after cleanup
-#if NH_3D_DMM
-  Bool         isDMM1UpscaleMode       ( UInt uiWidth ){ Bool bDMM1UpsampleModeFlag = true; UInt uiBaseWidth = 16; if( uiBaseWidth >= uiWidth ){ bDMM1UpsampleModeFlag = false; } return bDMM1UpsampleModeFlag; };
-  UInt         getDMM1BasePatternWidth ( UInt uiWidth ){ UInt uiBaseWidth = 16; if( uiBaseWidth >= uiWidth ){ uiBaseWidth =  uiWidth; } return uiBaseWidth; }
-#endif
-#endif
 };