Changeset 655 in 3DVCSoftware for trunk/source/Lib/TLibCommon/TComWedgelet.h

Timestamp:

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

Author:

tech

Message:

Merged 8.1-Cleanup@654

File:

• trunk/source/Lib/TLibCommon/TComWedgelet.h (modified) (3 diffs)

trunk/source/Lib/TLibCommon/TComWedgelet.h

@@ -50 +50 @@
 enum DIM_IDX
 {
-#if SEC_DMM2_E0146_HHIFIX
   DMM1_IDX = 0,
   DMM3_IDX = 1,
   DMM4_IDX = 2,
   RBC_IDX  = 3
-#else
-  DMM1_IDX = 0,
-  DMM2_IDX = 3,
-  DMM3_IDX = 1,
-  DMM4_IDX = 2,
-  RBC_IDX  = 4
-#endif
 };
-#if SEC_DMM2_E0146_HHIFIX
+
 #define DMM_NUM_TYPE   3
-#else
-#define DMM_NUM_TYPE   4
-#endif
 #define RBC_NUM_TYPE   1
 #define DIM_NUM_TYPE   (DMM_NUM_TYPE+RBC_NUM_TYPE)
@@ -86 +75 @@
 #define DMM_NO_WEDGEINDEX       MAX_UINT
 #define DMM_NUM_WEDGE_REFINES   8
-#if !SEC_DMM2_E0146_HHIFIX
-#define DMM2_DELTAEND_MAX       4
-#endif
 #define DMM3_SIMPLIFY_TR        1
 
@@ -151 +137 @@
   Bool  checkInvIdentical( Bool* pbRefPattern );
 
-#if !SEC_DMM2_E0146_HHIFIX
-  // functions for DMM2 prediction
-  Bool  checkPredDirAbovePossible( UInt uiPredDirBlockSize, UInt uiPredDirBlockOffsett );
-  Bool  checkPredDirLeftPossible ( UInt uiPredDirBlockSize, UInt uiPredDirBlockOffsett );
-  Void  getPredDirStartEndAbove( UChar& ruhXs, UChar& ruhYs, UChar& ruhXe, UChar& ruhYe, UInt uiPredDirBlockSize, UInt uiPredDirBlockOffset, Int iDeltaEnd );
-  Void  getPredDirStartEndLeft ( UChar& ruhXs, UChar& ruhYs, UChar& ruhXe, UChar& ruhYe, UInt uiPredDirBlockSize, UInt uiPredDirBlockOffset, Int iDeltaEnd );
-#endif
 };  // END CLASS DEFINITION TComWedgelet