Changeset 819 in 3DVCSoftware for branches/HTM-9.3-dev1-RWTH/source/Lib/TLibEncoder/TEncCu.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/TEncCu.cpp (modified) (1 diff)

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

@@ -2514 +2514 @@
       rpcTempCU->setMVPIdx(eRefList, uiPartAddr, pDBBPTmpData->aiMvpIdx[uiSegment][eRefList]);
       
-#if NTT_STORE_SPDV_VSP_G0148
-      if( rpcTempCU->getVSPFlag( uiPartAddr ) != 0 )
-      {
-        if ( rpcTempCU->getInterDir(uiPartAddr) & (1<<uiRefListIdx) )
-        {
-          UInt dummy;
-          Int vspSize;
-          Int width, height;
-          rpcTempCU->getPartIndexAndSize( uiSegment, dummy, width, height, uiPartAddr, rpcTempCU->getTotalNumPart()==256 );
-          AOF( dummy == uiPartAddr );
-          rpcTempCU->setMvFieldPUForVSP( rpcTempCU, uiPartAddr, width, height, eRefList, pDBBPTmpData->acMvField[uiSegment][eRefList].getRefIdx(), vspSize );
-          rpcTempCU->setVSPFlag( uiPartAddr, vspSize );
-        }
-      }
-      else
-#endif
       rpcTempCU->getCUMvField( eRefList )->setAllMvField( pDBBPTmpData->acMvField[uiSegment][eRefList], eVirtualPartSize, uiPartAddr, 0, uiSegment ); // interprets depth relative to rpcTempCU level
     }