Changeset 1121 in 3DVCSoftware for branches

Timestamp:

8 Nov 2014, 21:41:39 (10 years ago)

Author:

tech

Message:

Added missing guard macros.

Location:

branches/HTM-12.2-dev0/source

Files:

• App/TAppEncoder/TAppEncTop.cpp (modified) (1 diff)
• Lib/TLibCommon/TComSlice.cpp (modified) (1 diff)
• Lib/TLibEncoder/TEncSearch.cpp (modified) (1 diff)

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

@@ -277 +277 @@
 #endif
     m_cTEncTop.setUseSDC                       ( isDepth ? m_useSDC               : false );
-#endif
-
     m_cTEncTop.setUseDLT                       ( isDepth ? m_useDLT               : false );
+#endif
+
 
 #if H_3D_SINGLE_DEPTH

branches/HTM-12.2-dev0/source/Lib/TLibCommon/TComSlice.cpp

@@ -4063 +4063 @@
   Bool setupLUT = false; 
   
-#if H_3D_VSP
 #if HHI_TOOL_PARAMETERS_I2_J0107
   setupLUT = setupLUT || getViewSynthesisPredFlag( ); 
 #else
   Int layerIdInVPS = getVPS()->getLayerIdInNuh( m_layerId ); 
+#if H_3D_VSP
   setupLUT = setupLUT || getVPS()->getViewSynthesisPredFlag( layerIdInVPS); 
 #endif

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

@@ -3329 +3329 @@
 #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) );