Changeset 764 in 3DVCSoftware for branches/HTM-9.2-dev0/source/App/TAppEncoder/TAppEncTop.cpp

Timestamp:

12 Jan 2014, 00:23:20 (11 years ago)

Author:

tech

Message:

Cleanup part 1

File:

• branches/HTM-9.2-dev0/source/App/TAppEncoder/TAppEncTop.cpp (modified) (2 diffs)

branches/HTM-9.2-dev0/source/App/TAppEncoder/TAppEncTop.cpp

@@ -198 +198 @@
 #endif
 #if H_3D_IC
-#if SEC_ONLY_TEXTURE_IC_F0151
     m_cTEncTop.setUseIC                        ( vps.getViewIndex( layerId ) == 0 || isDepth ? false : m_abUseIC );
-#else
-    m_cTEncTop.setUseIC                        ( vps.getViewIndex( layerId ) == 0 ? false : m_abUseIC[isDepth ? 1 : 0] );
-#endif
 #endif
   //========== Depth intra modes ==========
 #if H_3D_DIM
     m_cTEncTop.setUseDMM                       ( isDepth ? m_useDMM               : false );
-#if !SEC_DMM3_RBC_F0147
-    m_cTEncTop.setUseRBC                       ( isDepth ? m_useRBC               : false );
-#endif
     m_cTEncTop.setUseSDC                       ( isDepth ? m_useSDC               : false );
     m_cTEncTop.setUseDLT                       ( isDepth ? m_useDLT               : false );
@@ -1997 +1990 @@
 
 #if H_3D_DIM
-#if SEC_DMM3_RBC_F0147
     vps.setVpsDepthModesFlag( layer, isDepth && !isLayerZero && (m_useDMM || m_useSDC || m_useDLT ) );
-#else
-    vps.setVpsDepthModesFlag( layer, isDepth && !isLayerZero && (m_useDMM || m_useRBC || m_useSDC || m_useDLT ) );
-#endif
 #if H_3D_DIM_DLT
 #if !DLT_DIFF_CODING_IN_PPS