Changeset 1272 in 3DVCSoftware for branches/HTM-14.1-update-dev3/source

Timestamp:

13 Jul 2015, 20:40:58 (9 years ago)

Author:

qualcomm

Message:

1) Fix issues of Sub-PU based inter view motion prediction when ARP is enabled; 2) minor code cleanups for VSP

Location:

branches/HTM-14.1-update-dev3/source/Lib

Files:

• TLibCommon/TypeDef.h (modified) (1 diff)
• TLibEncoder/TEncCu.cpp (modified) (5 diffs)

branches/HTM-14.1-update-dev3/source/Lib/TLibCommon/TypeDef.h

@@ -79 +79 @@
 #define NH_3D_DBBP                         1
 #define BUF_FIX 1
-#define NH_3D_ARP                         0  // Advanced residual prediction (ARP), JCT3V-D0177
+#define NH_3D_ARP                         1  // Advanced residual prediction (ARP), JCT3V-D0177
                                               // QC_MTK_INTERVIEW_ARP_F0123_F0108 JCT3V-F0123; JCT3V-F0108
                                               // SHARP_ARP_REF_CHECK_F0105        ARP reference picture selection and DPB check

branches/HTM-14.1-update-dev3/source/Lib/TLibEncoder/TEncCu.cpp

@@ -1832 +1832 @@
 
 #if NH_3D_VSP
-#if !H_3D_ARP
+#if !NH_3D_ARP
   Int vspFlag[MRG_MAX_NUM_CANDS_MEM];
   memset(vspFlag, 0, sizeof(Int)*MRG_MAX_NUM_CANDS_MEM);
@@ -1854 +1854 @@
     );
 #endif
-
 #endif
 #else
@@ -1930 +1929 @@
     rpcTempCU->getDvInfo(0) = cOrigDisInfo;
     rpcTempCU->setDvInfoSubParts(cOrigDisInfo, 0, uhDepth );
+#if NH_3D_VSP
     Int vspFlag[MRG_MAX_NUM_CANDS_MEM];
     memset(vspFlag, 0, sizeof(Int)*MRG_MAX_NUM_CANDS_MEM);
-#if H_3D_SPIVMP
-    Bool bSPIVMPFlag[MRG_MAX_NUM_CANDS_MEM];
-    memset(bSPIVMPFlag, false, sizeof(Bool)*MRG_MAX_NUM_CANDS_MEM);
-    TComMvField*  pcMvFieldSP;
-    UChar* puhInterDirSP;
-    pcMvFieldSP = new TComMvField[rpcTempCU->getPic()->getPicSym()->getNumPartition()*2]; 
-    puhInterDirSP = new UChar[rpcTempCU->getPic()->getPicSym()->getNumPartition()]; 
-#endif
-#if H_3D
+#endif
+#if NH_3D
+#if NH_3D_MLC
     rpcTempCU->initAvailableFlags();
+#endif
     rpcTempCU->getInterMergeCandidates( 0, 0, cMvFieldNeighbours, uhInterDirNeighbours, numValidMergeCand );
     rpcTempCU->xGetInterMergeCandidates( 0, 0, cMvFieldNeighbours,uhInterDirNeighbours
-#if H_3D_SPIVMP
+#if NH_3D_SPIVMP
       , pcMvFieldSP, puhInterDirSP
 #endif
@@ -1954 +1949 @@
       , vspFlag
 #endif
-#if H_3D_SPIVMP
+#if NH_3D_SPIVMP
       , bSPIVMPFlag
 #endif
@@ -2226 +2221 @@
   }
   DEBUG_STRING_APPEND(sDebug, bestStr)
+#if NH_3D_ARP
+ }
+#endif
 #if NH_3D_SPIVMP
  delete[] pcMvFieldSP;
  delete[] puhInterDirSP;
-#endif
-#if NH_3D_ARP
- }
 #endif
 }