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

Timestamp:

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

Author:

tech

Message:

Cleanup.

File:

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

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

@@ -409 +409 @@
 
 #if H_3D_QTLPC
-#if HHI_TOOL_PARAMETERS_I2_J0107
   Bool  bLimQtPredFalg    = pcPic->getSlice(0)->getQtPredFlag(); 
-#else
-    TComVPS *vps            = pcPic->getSlice(0)->getVPS();
-  Bool  bLimQtPredFalg    = vps->getLimQtPredFlag(pcPic->getSlice(0)->getLayerId()); 
-#endif
   TComPic *pcTexture      = rpcBestCU->getSlice()->getTexturePic();
 
@@ -570 +565 @@
       {
 #if H_3D_ARP && H_3D_IV_MERGE
-#if HHI_TOOL_PARAMETERS_I2_J0107
         if( rpcTempCU->getSlice()->getIvResPredFlag() || rpcTempCU->getSlice()->getIvMvPredFlag() )
-#else
-        if( rpcTempCU->getSlice()->getVPS()->getUseAdvRP(rpcTempCU->getSlice()->getLayerId()) || rpcTempCU->getSlice()->getVPS()->getIvMvPredFlag(rpcTempCU->getSlice()->getLayerId()) )
-#endif
 #else 
 #if H_3D_ARP
@@ -598 +589 @@
 #endif 
 #if H_3D_NBDV_REF
-#if HHI_TOOL_PARAMETERS_I2_J0107
           if( rpcTempCU->getSlice()->getDepthRefinementFlag() )
-#else
-          if(rpcTempCU->getSlice()->getVPS()->getDepthRefinementFlag( rpcTempCU->getSlice()->getLayerIdInVps()))
-#endif
             DvInfo.bDV = rpcTempCU->getDisMvpCandNBDV(&DvInfo, true);
           else
@@ -617 +604 @@
       }
 #if  H_3D_FAST_TEXTURE_ENCODING
-#if SEC_ARP_VIEW_REF_CHECK_J0037 || SEC_DBBP_VIEW_REF_CHECK_J0037
       if(rpcTempCU->getSlice()->getViewIndex() && !rpcTempCU->getSlice()->getIsDepth() && rpcTempCU->getSlice()->getDefaultRefViewIdxAvailableFlag() )
-#else
-      if(rpcTempCU->getSlice()->getViewIndex() && !rpcTempCU->getSlice()->getIsDepth())
-#endif
       {
         PartSize ePartTemp = rpcTempCU->getPartitionSize(0);
@@ -684 +667 @@
           
 #if H_3D_DBBP
-#if SEC_DBBP_VIEW_REF_CHECK_J0037
-#if HHI_TOOL_PARAMETERS_I2_J0107
           if( rpcTempCU->getSlice()->getDepthBasedBlkPartFlag() && rpcTempCU->getSlice()->getDefaultRefViewIdxAvailableFlag() )
-#else
-          if( m_pcEncCfg->getUseDBBP() && rpcTempCU->getSlice()->getDefaultRefViewIdxAvailableFlag() )
-#endif
-#else
-          if( m_pcEncCfg->getUseDBBP() )
-#endif
           {
             xCheckRDCostInterDBBP( rpcBestCU, rpcTempCU, false );
@@ -739 +714 @@
 #if H_3D_SINGLE_DEPTH
     rpcTempCU->initEstData( uiDepth, iMinQP, isAddLowestQP  );
-#if MTK_SINGLE_DEPTH_VPS_FLAG_J0060
-#if ALIGN_J0060_J0107
     if( rpcBestCU->getSlice()->getIntraSingleFlag() )
-#else
-    if(rpcBestCU->getSlice()->getVPS()->getSingleDepthModeFlag(rpcBestCU->getSlice()->getLayerIdInVps()))
-#endif
-#else
-    if(rpcBestCU->getSlice()->getApplySingleDepthMode())
-#endif
     {
       xCheckRDCostSingleDepth( rpcBestCU, rpcTempCU, SIZE_2Nx2N );
@@ -1901 +1868 @@
 
 #endif
-#if !LGE_DDD_REMOVAL_J0042_J0030
-#if H_3D_DDD
-    Int iDDDCand = rpcTempCU->getUseDDDCandIdx(); 
-    UChar ucDDDepth = rpcTempCU->getDDTmpDepth();
-    rpcTempCU->setUseDDD( false, 0, uhDepth );
-#endif
-#endif
 
   for( UInt uiNoResidual = 0; uiNoResidual < iteration; ++uiNoResidual )
@@ -1940 +1900 @@
 #if H_3D_VSP
           rpcTempCU->setVSPFlagSubParts( vspFlag[uiMergeCand], 0, 0, uhDepth );
-#endif
-#if !LGE_DDD_REMOVAL_J0042_J0030
-#if H_3D_DDD
-          if( rpcTempCU->getSlice()->getIsDepth() && rpcTempCU->getSlice()->getViewIndex() != 0 && iDDDCand == uiMergeCand )
-          {
-              rpcTempCU->setUseDDD( true, 0, 0, uhDepth );
-              rpcTempCU->setDDDepthSubParts( ucDDDepth, 0, 0, uhDepth );
-          }
-          else
-          {
-              rpcTempCU->setUseDDD( false, 0, 0, uhDepth );
-          }
-#endif
 #endif
 #if H_3D_SPIVMP
@@ -2056 +2003 @@
           xCheckBestMode(rpcBestCU, rpcTempCU, uhDepth);
 #if H_3D_INTER_SDC
-#if HHI_TOOL_PARAMETERS_I2_J0107
           if( rpcTempCU->getSlice()->getInterSdcFlag() && !uiNoResidual )
-#else
-          if( rpcTempCU->getSlice()->getVPS()->getInterSDCFlag( rpcTempCU->getSlice()->getLayerIdInVps() ) && rpcTempCU->getSlice()->getIsDepth() && !uiNoResidual )
-#endif
           {
             Double dOffsetCost[3] = {MAX_DOUBLE,MAX_DOUBLE,MAX_DOUBLE};
@@ -2132 +2075 @@
       {
 #if H_3D_INTER_SDC
-#if HHI_TOOL_PARAMETERS_I2_J0107
         if( rpcTempCU->getSlice()->getInterSdcFlag() )
-#else
-        if( rpcTempCU->getSlice()->getVPS()->getInterSDCFlag( rpcTempCU->getSlice()->getLayerIdInVps() ) )
-#endif
         {
           bestIsSkip = !rpcBestCU->getSDCFlag( 0 ) && ( rpcBestCU->getQtRootCbf(0) == 0 );
@@ -2212 +2151 @@
   UChar uhDepth = rpcTempCU->getDepth( 0 );
 #if H_3D_ARP
-#if !HHI_TOOL_PARAMETERS_I2_J0107
-  Int iLayerId    = rpcTempCU->getSlice()->getLayerId();
-#endif
   Bool bFirstTime = true;
   Int nARPWMax    = rpcTempCU->getSlice()->getARPStepNum() - 1;
@@ -2225 +2161 @@
   for( Int nARPW = 0; nARPW <= nARPWMax; nARPW++ )
   {
-#if HHI_TOOL_PARAMETERS_I2_J0107
     if( !bFirstTime && rpcTempCU->getSlice()->getIvResPredFlag() )
-#else
-    if( bFirstTime == false && rpcTempCU->getSlice()->getVPS()->getUseAdvRP( iLayerId ) )
-#endif
     {
       rpcTempCU->initEstData( rpcTempCU->getDepth(0), rpcTempCU->getQP(0),bTransquantBypassFlag );      
@@ -2253 +2185 @@
   rpcTempCU->setPartSizeSubParts  ( ePartSize,  0, uhDepth );
   rpcTempCU->setPredModeSubParts  ( MODE_INTER, 0, uhDepth );
-#if !LGE_DDD_REMOVAL_J0042_J0030
-#if H_3D_DDD
-  rpcTempCU->setUseDDD( false, 0, uhDepth );
-#endif
-#endif
 
 #if H_3D_ARP
@@ -2335 +2262 @@
   xCheckBestMode(rpcBestCU, rpcTempCU, uhDepth);
 #if H_3D_INTER_SDC
-#if HHI_TOOL_PARAMETERS_I2_J0107
   if( rpcTempCU->getSlice()->getInterSdcFlag() && ePartSize == SIZE_2Nx2N)
-#else
-  if( rpcTempCU->getSlice()->getVPS()->getInterSDCFlag( rpcTempCU->getSlice()->getLayerIdInVps() ) && rpcTempCU->getSlice()->getIsDepth() && ePartSize == SIZE_2Nx2N)
-#endif
   {
     Double dOffsetCost[3] = {MAX_DOUBLE,MAX_DOUBLE,MAX_DOUBLE};