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

Timestamp:

11 Sep 2013, 14:40:25 (12 years ago)

Author:

tech

Message:

Merged 8.0-dev0@621 (MV-HEVC 5 HLS).

File:

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

trunk/source/Lib/TLibCommon/TComWedgelet.h

@@ -50 +50 @@
 enum DIM_IDX
 {
-#if SEC_DMM2_E0146
+#if SEC_DMM2_E0146_HHIFIX
   DMM1_IDX = 0,
   DMM3_IDX = 1,
@@ -63 +63 @@
 #endif
 };
-#if SEC_DMM2_E0146
+#if SEC_DMM2_E0146_HHIFIX
 #define DMM_NUM_TYPE   3
 #else
@@ -86 +86 @@
 #define DMM_NO_WEDGEINDEX       MAX_UINT
 #define DMM_NUM_WEDGE_REFINES   8
-#if !SEC_DMM2_E0146
+#if !SEC_DMM2_E0146_HHIFIX
 #define DMM2_DELTAEND_MAX       4
 #endif
@@ -151 +151 @@
   Bool  checkInvIdentical( Bool* pbRefPattern );
 
+#if !SEC_DMM2_E0146_HHIFIX
   // functions for DMM2 prediction
   Bool  checkPredDirAbovePossible( UInt uiPredDirBlockSize, UInt uiPredDirBlockOffsett );
@@ -156 +157 @@
   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