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

Timestamp:

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

Author:

rwth

Message:

• integration of H0057 and H0072

Location:

branches/HTM-10.2-dev2-RWTH/source/Lib/TLibCommon

Files:

• TComDataCU.cpp (modified) (6 diffs)
• TComDataCU.h (modified) (1 diff)
• TComPrediction.cpp (modified) (4 diffs)
• TypeDef.h (modified) (1 diff)

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

@@ -3940 +3940 @@
       && !bARPFlag
 #endif
+#if RWTH_H0057_DBBP_NO_SPU
+      && !bDBBPFlag
+#endif
       )
     {
@@ -3963 +3966 @@
       && !bARPFlag
 #endif
+#if RWTH_H0057_DBBP_NO_SPU
+      && !bDBBPFlag
+#endif
       )
     {
@@ -3986 +3992 @@
       && !bARPFlag
 #endif
+#if RWTH_H0057_DBBP_NO_SPU
+      && !bDBBPFlag
+#endif
       )
     {
@@ -4006 +4015 @@
 #if H_3D_ARP
       && !bARPFlag
+#endif
+#if RWTH_H0057_DBBP_NO_SPU
+      && !bDBBPFlag
 #endif
       )
@@ -4029 +4041 @@
 #if H_3D_ARP
       && !bARPFlag
+#endif
+#if RWTH_H0057_DBBP_NO_SPU
+      && !bDBBPFlag
 #endif
       )
@@ -4689 +4704 @@
 #if H_3D_ARP
       !bARPFlag &&
+#endif
+#if RWTH_H0057_DBBP_NO_SPU
+      !bDBBPFlag &&
 #endif
       xAddVspCand( mrgCandIdx, &cDisInfo, iCount, abCandIsInter, pcMvFieldNeighbours, puhInterDirNeighbours, vspFlag, iCount3DV, inheritedVSPDisInfo ) )

branches/HTM-10.2-dev2-RWTH/source/Lib/TLibCommon/TComDataCU.h

@@ -70 +70 @@
   Bool        abMergeFlag[2];       // for two segments
   UChar       auhMergeIndex[2];     // for two segments
+#if !RWTH_H0057_DBBP_NO_SPU
   Char        ahVSPFlag[2];         // for two segments
   DisInfo     acDvInfo[2];          // for two segments
+#endif
   
   PartSize    eVirtualPartSize;

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

branches/HTM-10.2-dev2-RWTH/source/Lib/TLibCommon/TypeDef.h

@@ -295 +295 @@
 #define DBBP_INVALID_SHORT                (-4)
 #define RWTH_DBBP_PACK_MODE               SIZE_2NxN
+#define MTK_H0072_DBBP_AMP_REM                 1
+#define RWTH_H0057_DBBP_NO_SPU                 1
 #endif