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

Timestamp:

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

Author:

tech

Message:

Cleanup.

File:

• branches/HTM-13.0-dev0/source/Lib/TLibEncoder/TEncSearch.cpp (modified) (10 diffs)

branches/HTM-13.0-dev0/source/Lib/TLibEncoder/TEncSearch.cpp

@@ -2881 +2881 @@
   Int index=0;
   Pel testDepth;
-#if SINGLE_DEPTH_SIMP_J0115
   Pel DepthNeighbours[2];
-#else
-  Pel DepthNeighbours[5];
-#endif
   //construction of depth candidates
-#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, 0, &testDepth, i))
@@ -2899 +2891 @@
     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
   }
 
@@ -3132 +3114 @@
     if( m_pcEncCfg->getIsDepth() && uiWidth >= DIM_MIN_SIZE && uiWidth <= DIM_MAX_SIZE && uiWidth == uiHeight )
     {
-#if HHI_TOOL_PARAMETERS_I2_J0107
       if( bOnlyIVP && pcCU->getSlice()->getIntraContourFlag() )
-#else
-      if( bOnlyIVP && m_pcEncCfg->getUseIVP() )
-#endif
       {
         TComWedgelet* dmm4Segmentation = new TComWedgelet( uiWidth, uiHeight );
@@ -3158 +3136 @@
 
 #if H_3D_DIM_DMM
-#if HHI_TOOL_PARAMETERS_I2_J0107
       if( ( ( m_pcEncCfg->getUseDMM() &&  pcCU->getSlice()->getIntraSdcWedgeFlag() )  || pcCU->getSlice()->getIntraContourFlag() )
-#else
-      if( ( m_pcEncCfg->getUseDMM() || m_pcEncCfg->getUseIVP() )
-#endif
 #if H_3D_FAST_DEPTH_INTRA
          && (uiRdModeList[0] != PLANAR_IDX || varCU >= varThreshold)
@@ -3169 +3143 @@
       {
         UInt uiStart, uiEnd;
-#if HHI_TOOL_PARAMETERS_I2_J0107
         if( ( m_pcEncCfg->getUseDMM() &&  pcCU->getSlice()->getIntraSdcWedgeFlag() ) &&  pcCU->getSlice()->getIntraContourFlag() )
-#else
-        if( m_pcEncCfg->getUseDMM() &&  m_pcEncCfg->getUseIVP() )
-#endif
         {
           uiStart = 0;
           uiEnd   = 2;
         }
-#if HHI_TOOL_PARAMETERS_I2_J0107
         else if( ( m_pcEncCfg->getUseDMM() &&  pcCU->getSlice()->getIntraSdcWedgeFlag() ) )
-#else
-        else if( m_pcEncCfg->getUseDMM() )
-#endif
         {
           uiStart = 0;
           uiEnd   = 1;
         }
-#if HHI_TOOL_PARAMETERS_I2_J0107
         else if( pcCU->getSlice()->getIntraContourFlag() )
-#else
-        else if( m_pcEncCfg->getUseIVP() )
-#endif
         {
           uiStart = 1;
@@ -3329 +3291 @@
 #if H_3D_DIM_SDC
 #if H_3D_FAST_INTRA_SDC
-#if HHI_TOOL_PARAMETERS_I2_J0107
       Bool bTestSDC = ( ( m_pcEncCfg->getUseSDC() &&  pcCU->getSlice()->getIntraSdcWedgeFlag() ) && pcCU->getSDCAvailable(uiPartOffset) && uiMode >= numModesForFullRD);
-#else
-      Bool bTestSDC = ( m_pcEncCfg->getUseSDC() && pcCU->getSDCAvailable(uiPartOffset) && uiMode >= numModesForFullRD);
-#endif
 #else
       Bool bTestSDC = ( m_pcEncCfg->getUseSDC() && pcCU->getSDCAvailable(uiPartOffset) );
@@ -4177 +4135 @@
       }
 #endif
-#if !LGE_DDD_REMOVAL_J0042_J0030
-#if H_3D_DDD
-      if( uiMergeCand == pcCU->getUseDDDCandIdx() )
-      {
-        pcCU->setUseDDD( true, uiAbsPartIdx, iPUIdx, pcCU->getDepth( uiAbsPartIdx ) );
-        pcCU->setDDDepthSubParts( pcCU->getDDTmpDepth(), uiAbsPartIdx, iPUIdx, pcCU->getDepth( uiAbsPartIdx ) );
-      }
-      else
-      {
-        pcCU->setUseDDD( false, uiAbsPartIdx, iPUIdx, pcCU->getDepth( uiAbsPartIdx ) );
-      }
-#endif
-#endif
 
       xGetInterPredictionError( pcCU, pcYuvOrg, iPUIdx, uiCostCand, m_pcEncCfg->getUseHADME() );
@@ -4875 +4820 @@
 #if H_3D_VSP
         pcCU->setVSPFlagSubParts( vspFlag[uiMRGIndex], uiPartAddr, iPartIdx, pcCU->getDepth( uiPartAddr ) );
-#endif
-#if !LGE_DDD_REMOVAL_J0042_J0030
-#if H_3D_DDD
-        if( uiMRGIndex == pcCU->getUseDDDCandIdx() )
-        {
-            assert( vspFlag[uiMRGIndex]     == 0 );
-            assert( bSPIVMPFlag[uiMRGIndex] == 0 );
-            pcCU->setUseDDD( true, uiPartAddr, iPartIdx, pcCU->getDepth( uiPartAddr ) );
-            pcCU->setDDDepthSubParts( pcCU->getDDTmpDepth(), uiPartAddr, iPartIdx, pcCU->getDepth( uiPartAddr ) );
-        }
-        else
-        {
-            pcCU->setUseDDD( false, uiPartAddr, iPartIdx, pcCU->getDepth( uiPartAddr ) );
-        }
-#endif
 #endif
 #if H_3D_SPIVMP
@@ -4967 +4897 @@
         pcCU->setSPIVMPFlagSubParts(0, uiPartAddr, iPartIdx, pcCU->getDepth( uiPartAddr ) ); 
 #endif
-#if !LGE_DDD_REMOVAL_J0042_J0030
-#if H_3D_DDD
-        pcCU->setUseDDD( false, uiPartAddr, iPartIdx, pcCU->getDepth( uiPartAddr ) );
-#endif
-#endif
         // set ME result
         pcCU->setMergeFlagSubParts( false,        uiPartAddr, iPartIdx, pcCU->getDepth( uiPartAddr ) );
@@ -5353 +5278 @@
 #endif
 #if H_3D_INTER_SDC
-#if HHI_TOOL_PARAMETERS_I2_J0107  
    pcPatternKey->setSDCMRSADFlag( pcCU->getSlice()->getInterSdcFlag() );
-#else
-  if ( pcCU->getSlice()->getIsDepth() && pcCU->getSlice()->getVPS()->getInterSDCFlag( pcCU->getSlice()->getLayerIdInVps() ) )
-  {
-    pcPatternKey->setSDCMRSADFlag( true );
-  } 
-  else
-  {
-    pcPatternKey->setSDCMRSADFlag( false );
-  }
-#endif
 #endif