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

Timestamp:

4 Apr 2014, 16:15:09 (10 years ago)

Author:

rwth

Message:

• integration of H0057 and H0072

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
   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
   PartSize virtualPartSizes[6] = { SIZE_Nx2N, SIZE_2NxN, SIZE_2NxnU, SIZE_2NxnD, SIZE_nLx2N, SIZE_nRx2N };
+#else
+  Int matchedPartSum[2][2] = {{0,0},{0,0}}; // counter for each part size and boolean option
+  PartSize virtualPartSizes[2] = { SIZE_Nx2N, SIZE_2NxN};
+#endif
   
   UInt uiHalfSize = uiSize>>1;
+#if !MTK_H0072_DBBP_AMP_REM
   UInt uiQuarterSize = uiSize>>2;
+#endif
   
   for (Int y=0; y<uiSize; y+=iSubSample)
@@ -677 +684 @@
       }
       
+#if !MTK_H0072_DBBP_AMP_REM
       if( bAMPAvail )
       {
@@ -719 +727 @@
         }
       }
+#endif
     }
     
@@ -728 +737 @@
   
   Int iMaxMatchSum = 0;
-  for(Int p=0; p<6; p++)  // loop over partition sizes
+#if !MTK_H0072_DBBP_AMP_REM
+  for(Int p=0; p<6; p++)  // loop over partition
+#else
+  for(Int p=0; p<2; p++)  // loop over partition
+#endif
   {
     for( Int b=0; b<=1; b++ ) // loop over boolean options