Changeset 765 in 3DVCSoftware for branches/HTM-9.2-dev0/source/Lib/TLibDecoder/TDecEntropy.cpp

Timestamp:

12 Jan 2014, 02:46:46 (10 years ago)

Author:

tech

Message:

Cleanup part 2

File:

• branches/HTM-9.2-dev0/source/Lib/TLibDecoder/TDecEntropy.cpp (modified) (7 diffs)

branches/HTM-9.2-dev0/source/Lib/TLibDecoder/TDecEntropy.cpp

@@ -209 +209 @@
   UChar uhInterDirNeighbours[MRG_MAX_NUM_CANDS];
 #endif
-#if MTK_SPIVMP_F0110
+#if H_3D_SPIVMP
   Bool bSPIVMPFlag[MRG_MAX_NUM_CANDS_MEM];
   TComMvField*  pcMvFieldSP;
@@ -256 +256 @@
           memset(vspFlag, 0, sizeof(Int)*MRG_MAX_NUM_CANDS_MEM);
           InheritedVSPDisInfo inheritedVSPDisInfo[MRG_MAX_NUM_CANDS_MEM];
-#if MTK_SPIVMP_F0110
+#if H_3D_SPIVMP
           memset(bSPIVMPFlag, false, sizeof(Bool)*MRG_MAX_NUM_CANDS_MEM);
 #endif
@@ -262 +262 @@
           pcSubCU->getInterMergeCandidates( 0, 0, cMvFieldNeighbours, uhInterDirNeighbours, numValidMergeCand);
           pcSubCU->xGetInterMergeCandidates( 0, 0, cMvFieldNeighbours, uhInterDirNeighbours, vspFlag, inheritedVSPDisInfo
-#if MTK_SPIVMP_F0110
+#if H_3D_SPIVMP
             , bSPIVMPFlag, pcMvFieldSP, puhInterDirSP
 #endif
@@ -293 +293 @@
         memset(vspFlag, 0, sizeof(Int)*MRG_MAX_NUM_CANDS_MEM);
         InheritedVSPDisInfo inheritedVSPDisInfo[MRG_MAX_NUM_CANDS_MEM];
-#if MTK_SPIVMP_F0110
+#if H_3D_SPIVMP
         memset(bSPIVMPFlag, false, sizeof(Bool)*MRG_MAX_NUM_CANDS_MEM);
 #endif
@@ -299 +299 @@
         pcSubCU->getInterMergeCandidates( uiSubPartIdx-uiAbsPartIdx, uiPartIdx, cMvFieldNeighbours, uhInterDirNeighbours, numValidMergeCand, uiMergeIndex );
         pcSubCU->xGetInterMergeCandidates( uiSubPartIdx-uiAbsPartIdx, uiPartIdx, cMvFieldNeighbours, uhInterDirNeighbours, vspFlag, inheritedVSPDisInfo
-#if MTK_SPIVMP_F0110
+#if H_3D_SPIVMP
           , bSPIVMPFlag, pcMvFieldSP, puhInterDirSP
 #endif
@@ -331 +331 @@
         }
       }
-#if MTK_SPIVMP_F0110
+#if H_3D_SPIVMP
       pcCU->setSPIVMPFlagSubParts(bSPIVMPFlag[uiMergeIndex], uiSubPartIdx, uiPartIdx, uiDepth );  
       if (bSPIVMPFlag[uiMergeIndex] != 0)
@@ -385 +385 @@
     }
   }
-#if MTK_SPIVMP_F0110
-#if MTK_F0110_FIX
+#if H_3D_SPIVMP
   delete[] pcMvFieldSP;
   delete[] puhInterDirSP;
-#else
-  delete pcMvFieldSP;
-  delete puhInterDirSP;
-#endif
 #endif
   return;