Changeset 898 in 3DVCSoftware for branches/HTM-10.2-dev2-RWTH/source/Lib/TLibCommon/TComPrediction.cpp

Timestamp:

8 Apr 2014, 10:51:56 (10 years ago)

Author:

rwth

Message:

• renamed macros
• all changes are now encapsulated by guard macros
• H0057 on and H0072 off

File:

• branches/HTM-10.2-dev2-RWTH/source/Lib/TLibCommon/TComPrediction.cpp (modified) (4 diffs)

branches/HTM-10.2-dev2-RWTH/source/Lib/TLibCommon/TComPrediction.cpp

@@ -639 +639 @@
   
   // start mapping process
-#if !MTK_H0072_DBBP_AMP_REM
+#if !MTK_DBBP_AMP_REM_H0072
   Bool bAMPAvail = uiSize > 8;
   Int matchedPartSum[6][2] = {{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}}; // counter for each part size and boolean option
@@ -649 +649 @@
   
   UInt uiHalfSize = uiSize>>1;
-#if !MTK_H0072_DBBP_AMP_REM
+#if !MTK_DBBP_AMP_REM_H0072
   UInt uiQuarterSize = uiSize>>2;
 #endif
@@ -684 +684 @@
       }
       
-#if !MTK_H0072_DBBP_AMP_REM
+#if !MTK_DBBP_AMP_REM_H0072
       if( bAMPAvail )
       {
@@ -737 +737 @@
   
   Int iMaxMatchSum = 0;
-#if !MTK_H0072_DBBP_AMP_REM
+#if !MTK_DBBP_AMP_REM_H0072
   for(Int p=0; p<6; p++)  // loop over partition
 #else