Changeset 819 in 3DVCSoftware for branches/HTM-9.3-dev1-RWTH/source/Lib/TLibEncoder/TEncSearch.cpp

Timestamp:

4 Feb 2014, 09:36:30 (10 years ago)

Author:

rwth

Message:

• make G0106 and G0148 mutually exclusive

File:

• branches/HTM-9.3-dev1-RWTH/source/Lib/TLibEncoder/TEncSearch.cpp (modified) (3 diffs)

branches/HTM-9.3-dev1-RWTH/source/Lib/TLibEncoder/TEncSearch.cpp

@@ -3609 +3609 @@
         RefPicList eRefList = (RefPicList)uiRefListIdx;
         
-#if NTT_STORE_SPDV_VSP_G0148
-        if( pcCU->getVSPFlag( 0 ) != 0 )
-        {
-          if ( pcCU->getInterDir(0) & (1<<uiRefListIdx) )
-          {
-            UInt dummy;
-            Int vspSize;
-            Int width, height;
-            pcCU->getPartIndexAndSize( 0, dummy, width, height, 0, pcCU->getTotalNumPart()==256 );
-            AOF( dummy == 0 );
-            pcCU->setMvFieldPUForVSP( pcCU, 0, width, height, eRefList, pDBBPTmpData->acMvField[0][eRefList].getRefIdx(), vspSize );
-            pcCU->setVSPFlag( 0, vspSize );
-          }
-        }
-        else
-#endif
         pcCU->getCUMvField( eRefList )->setAllMvField( pDBBPTmpData->acMvField[0][eRefList], pDBBPTmpData->eVirtualPartSize, 0, 0, 0 ); // interprets depth relative to rpcTempCU level
       }
@@ -3739 +3723 @@
 #endif
 #if NTT_STORE_SPDV_VSP_G0148
+#if H_3D_DBBP
+      if ( vspFlag[uiMergeCand] && !pcCU->getDBBPFlag(0) )
+#else
       if ( vspFlag[uiMergeCand] )
+#endif
       {
         UInt partAddr;
@@ -4535 +4523 @@
 #endif
 #if NTT_STORE_SPDV_VSP_G0148
+#if H_3D_DBBP
+        if ( vspFlag[uiMRGIndex] && !pcCU->getDBBPFlag(uiPartAddr) )
+#else
         if ( vspFlag[uiMRGIndex] )
+#endif
         {
           UInt partAddrTemp;