Changeset 1131 in 3DVCSoftware for branches/HTM-13.0-dev0/source/Lib/TLibDecoder/TDecCu.cpp

Timestamp:

18 Feb 2015, 17:39:40 (10 years ago)

Author:

tech

Message:

Cleanup.

File:

• branches/HTM-13.0-dev0/source/Lib/TLibDecoder/TDecCu.cpp (modified) (6 diffs)

branches/HTM-13.0-dev0/source/Lib/TLibDecoder/TDecCu.cpp

@@ -291 +291 @@
   DTRACE_CU_S("=========== coding_unit ===========\n")
 #endif
-#if !LGE_DDD_REMOVAL_J0042_J0030
-#if H_3D_DDD
-      pcCU->setUseDDD( false, uiAbsPartIdx, uiDepth );
-#endif
-#endif
 
   if( (g_uiMaxCUWidth>>uiDepth) >= pcCU->getSlice()->getPPS()->getMinCuDQPSize() && pcCU->getSlice()->getPPS()->getUseDQP())
@@ -315 +310 @@
   {
 #if H_3D_ARP && H_3D_IV_MERGE
-#if HHI_TOOL_PARAMETERS_I2_J0107
     if( pcCU->getSlice()->getIvResPredFlag() || pcCU->getSlice()->getIvMvPredFlag() )
-#else
-    if( pcCU->getSlice()->getVPS()->getUseAdvRP( pcCU->getSlice()->getLayerId() ) || pcCU->getSlice()->getVPS()->getIvMvPredFlag( pcCU->getSlice()->getLayerId() ))
-#endif
 #else 
 #if H_3D_ARP
@@ -349 +340 @@
 #endif
 #if H_3D_NBDV_REF
-#if HHI_TOOL_PARAMETERS_I2_J0107
       if( pcCU->getSlice()->getDepthBasedBlkPartFlag() )  //Notes from QC: please check the condition for DoNBDV. Remove this comment once it is done.
-#else
-      if(pcCU->getSlice()->getVPS()->getDepthRefinementFlag( pcCU->getSlice()->getLayerIdInVps() ))  //Notes from QC: please check the condition for DoNBDV. Remove this comment once it is done.
-#endif
       {
         DvInfo.bDV = m_ppcCU[uiDepth]->getDisMvpCandNBDV(&DvInfo, true);
@@ -460 +447 @@
 #endif
     pcCU->setInterDirSubParts( uhInterDirNeighbours[uiMergeIndex], uiAbsPartIdx, 0, uiDepth );
-#if !LGE_DDD_REMOVAL_J0042_J0030
-#if H_3D_DDD
-    if( uiMergeIndex == m_ppcCU[uiDepth]->getUseDDDCandIdx() )
-    {
-        assert( pcCU->getSlice()->getViewIndex() != 0 );
-        pcCU->setUseDDD( true, uiAbsPartIdx, 0, uiDepth );
-        pcCU->setDDDepthSubParts( m_ppcCU[uiDepth]->getDDTmpDepth(),uiAbsPartIdx, 0, uiDepth );
-    }
-#endif
-#endif
 
     TComMv cTmpMv( 0, 0 );
@@ -744 +721 @@
   //construction of depth candidates
   Pel testDepth;
-#if SINGLE_DEPTH_SIMP_J0115
   Pel DepthNeighbours[2];
-#else
-  Pel DepthNeighbours[5];
-#endif
   Int index =0;
-#if SINGLE_DEPTH_SIMP_J0115
   for( Int i = 0; (i < 2) && (index<SINGLE_DEPTH_MODE_CAND_LIST_SIZE) ; i++ )
-#else
-  for( Int i = 0; (i < 5) && (index<SINGLE_DEPTH_MODE_CAND_LIST_SIZE) ; i++ )
-#endif
   {
     if(!pcCU->getNeighDepth (0, uiAbsPartIdx, &testDepth, i))
@@ -762 +731 @@
     DepthNeighbours[index]=testDepth;
     index++;
-#if !SINGLE_DEPTH_SIMP_J0115
-    for(Int j=0;j<index-1;j++)
-    {
-     if( (DepthNeighbours[index-1]==DepthNeighbours[j]) )
-     {
-       index--;
-       break;
-     }
-    }
-#endif
   }