Changeset 310 in SHVCSoftware for trunk/source/Lib/TLibDecoder/TDecEntropy.cpp

Timestamp:

22 Jul 2013, 21:40:00 (11 years ago)

Author:

seregin

Message:

reintegrate SHM-2.1-dev branch

Location:

trunk

Files:

• . (modified) (1 prop)
• source (modified) (1 prop)
• source/Lib/TLibDecoder/TDecEntropy.cpp (modified) (1 diff)

trunk/source/Lib/TLibDecoder/TDecEntropy.cpp

@@ -188 +188 @@
       decodeMergeIndex( pcCU, uiPartIdx, uiSubPartIdx, uiDepth );
       UInt uiMergeIndex = pcCU->getMergeIndex(uiSubPartIdx);
-#if 0 //REF_IDX_FRAMEWORK  // HM bug fix
-      if(uiPartIdx)
-      {
-        for(UInt ui=0; ui<uiMergeIndex+1; ui++)
-        {
-          cMvFieldNeighbours[(ui<<1)].setMvField(TComMv(), NOT_VALID);
-          cMvFieldNeighbours[(ui<<1)+1].setMvField(TComMv(), NOT_VALID);
-        }
-      }
-#endif
       if ( pcCU->getSlice()->getPPS()->getLog2ParallelMergeLevelMinus2() && ePartSize != SIZE_2Nx2N && pcSubCU->getWidth( 0 ) <= 8 ) 
       {