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

Timestamp:

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

Author:

tech

Message:

Cleanup.

File:

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

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

@@ -215 +215 @@
   rpcSlice->setPicOutputFlag( true );
   rpcSlice->setPOC( pocCurr );
-#if HHI_TOOL_PARAMETERS_I2_J0107
 #if H_3D
   rpcSlice->init3dToolParameters(); 
-#endif
 #endif
 #if H_3D_IC
@@ -613 +611 @@
   rpcSlice->setSliceSegmentArgument ( m_pcCfg->getSliceSegmentArgument() );
 #if H_3D_IV_MERGE
-#if HHI_TOOL_PARAMETERS_I2_J0107
-#if ALGIN_J0107_J0059
   rpcSlice->setMaxNumMergeCand      ( m_pcCfg->getMaxNumMergeCand()   + ( ( rpcSlice->getMpiFlag( ) || rpcSlice->getIvMvPredFlag( ) || rpcSlice->getViewSynthesisPredFlag( )   ) ? 1 : 0 ));
-#else
-  rpcSlice->setMaxNumMergeCand      ( m_pcCfg->getMaxNumMergeCand()   + ( ( rpcSlice->getMpiFlag( ) || rpcSlice->getIvMvPredFlag( ) ) ? 1 : 0 ));
-#endif
-#else
-  if(rpcSlice->getIsDepth())
-  {
-    rpcSlice->setMaxNumMergeCand      ( m_pcCfg->getMaxNumMergeCand()   + ( ( rpcSlice->getVPS()->getMPIFlag( rpcSlice->getLayerIdInVps() ) || rpcSlice->getVPS()->getIvMvPredFlag( rpcSlice->getLayerIdInVps() ) ) ? 1 : 0 ) );
-  }
-  else
-  {
-#if MTK_MRG_LIST_SIZE_CLEANUP_J0059
-    rpcSlice->setMaxNumMergeCand      ( m_pcCfg->getMaxNumMergeCand()   + ( rpcSlice->getVPS()->getIvMvPredFlag( rpcSlice->getLayerIdInVps() )  || rpcSlice->getVPS()->getViewSynthesisPredFlag( rpcSlice->getLayerIdInVps() ) ? 1 : 0 ) );
-#else
-    rpcSlice->setMaxNumMergeCand      ( m_pcCfg->getMaxNumMergeCand()   + ( rpcSlice->getVPS()->getIvMvPredFlag( rpcSlice->getLayerIdInVps() ) ? 1 : 0 ) );
-#endif
-  }
-#endif
 #else
   rpcSlice->setMaxNumMergeCand        ( m_pcCfg->getMaxNumMergeCand()        );
@@ -1028 +1007 @@
     }
   }
-#if LGE_DEFAULT_DV_J0046 && !SEC_ARP_VIEW_REF_CHECK_J0037 && !SEC_DBBP_VIEW_REF_CHECK_J0037
-  pcSlice->setDefaultRefViewIdx( -1 );
-  pcSlice->setDefaultRefViewIdxAvailableFlag( false ); 
-
-  Int valid = 0;
-  Int viewIndex = 0;
-  for( UInt uiBId = 0; uiBId < pcSlice->getViewIndex() && valid==0; uiBId++ )
-  {
-      UInt        uiBaseId    = uiBId;
-      TComPic*    pcBasePic   = pcSlice->getIvPic( false, uiBaseId );
-      for( Int iRefListId = 0; ( iRefListId < (pcSlice->isInterB()? 2:1) ) && !pcSlice->isIntra() && valid==0; iRefListId++ )
-      {
-          RefPicList  eRefPicListTest = RefPicList( iRefListId );
-          Int         iNumRefPics = pcSlice->getNumRefIdx( eRefPicListTest ) ;
-          for( Int iRefIndex = 0; iRefIndex < iNumRefPics; iRefIndex++ )
-          { 
-              if(pcBasePic->getPOC() == pcSlice->getRefPic( eRefPicListTest, iRefIndex )->getPOC() 
-                  && pcBasePic->getViewIndex() == pcSlice->getRefPic( eRefPicListTest, iRefIndex )->getViewIndex())
-              {
-                  valid=1;
-                  viewIndex = uiBaseId;
-                  break;
-              }
-          }
-      }
-  }
-  if( valid )
-  {
-      pcSlice->setDefaultRefViewIdx( viewIndex );
-      pcSlice->setDefaultRefViewIdxAvailableFlag( true );   
-  }
-#endif
 
   // for every CU in slice