Changeset 412 in 3DVCSoftware for branches/HTM-6.2-dev2-MERL/source/Lib/TLibDecoder/TDecCu.cpp

Timestamp:

16 May 2013, 16:05:31 (11 years ago)

Author:

mitsubishi-htm

Message:

-D0166 part 1, set refView selection for NBDV.

File:

• branches/HTM-6.2-dev2-MERL/source/Lib/TLibDecoder/TDecCu.cpp (modified) (4 diffs)

branches/HTM-6.2-dev2-MERL/source/Lib/TLibDecoder/TDecCu.cpp

@@ -393 +393 @@
         const UChar uhNewDepth = max<UInt>( uiDepth, pcTextureCU->getDepth( uiAbsPartIdx + ui ) );
 #if MERL_VSP_C0152
-        Int vspIdx = pcTextureCU->getVSPIndex( uiAbsPartIdx + ui);
-        pcCU->setVSPIndex( uiAbsPartIdx + ui, vspIdx);
+        Int vspIdx = pcTextureCU->getVSPIndex( uiAbsPartIdx + ui );
+        pcCU->setVSPIndex( uiAbsPartIdx + ui, vspIdx );
+#endif
+#if MERL_VSP_NBDV_RefVId_Fix_D0166
+        Int vspDir = pcTextureCU->getVSPDir( uiAbsPartIdx + ui );
+        pcCU->setVSPDir( uiAbsPartIdx + ui, vspDir );
 #endif
         pcCU->setPredictionMode( uiAbsPartIdx + ui, MODE_SKIP );
@@ -412 +416 @@
 #if MERL_VSP_C0152
     Int iVSPIndexTrue[3] = {-1, -1, -1};
+#if MERL_VSP_NBDV_RefVId_Fix_D0166
+    Int iVSPDirTrue[3]   = {-1, -1, -1};
+    m_ppcCU[uiDepth]->getInterMergeCandidates( 0, 0, uiDepth, cMvFieldNeighbours, uhInterDirNeighbours, numValidMergeCand, iVSPIndexTrue, iVSPDirTrue, uiMergeIndex );
+#else
     m_ppcCU[uiDepth]->getInterMergeCandidates( 0, 0, uiDepth, cMvFieldNeighbours, uhInterDirNeighbours, numValidMergeCand, iVSPIndexTrue, uiMergeIndex );
+#endif
     {
       Int iVSPIdx = 0;
@@ -425 +434 @@
           }
       }
-      pcCU->setVSPIndexSubParts( iVSPIdx, uiAbsPartIdx, 0, uiDepth );  //Initialize the VSP, may change later in get InterMergeCandidates()
+      pcCU->setVSPIndexSubParts( iVSPIdx, uiAbsPartIdx, 0, uiDepth );  // Initialize
+#if MERL_VSP_NBDV_RefVId_Fix_D0166
+      pcCU->setVSPDirSubParts( iVSPDirTrue[iVSPIdx-1], uiAbsPartIdx, 0, uiDepth );
+#endif
     }
 #else
@@ -530 +542 @@
         Int vspIdx = pcTextureCU->getVSPIndex( uiAbsPartIdx + ui);
         pcCU->setVSPIndex( uiAbsPartIdx + ui, vspIdx);
+#endif
+#if MERL_VSP_NBDV_RefVId_Fix_D0166
+        if (pcCU->getSlice()->getIsDepth()) {
+          pcCU->setVSPDir( uiAbsPartIdx + ui, 0);
+        }
+        else {
+          Int vspDir = pcTextureCU->getVSPDir( uiAbsPartIdx + ui);
+          pcCU->setVSPDir( uiAbsPartIdx + ui, vspDir);
+        }
 #endif
         pcCU->setPredictionMode( uiAbsPartIdx + ui, MODE_INTER );