Changeset 1106 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibDecoder

Timestamp:

6 Jul 2015, 20:51:30 (11 years ago)

Author:

seregin

Message:

macro cleanup: FIX_CONF_MODE

File:

• branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.cpp (modified) (2 diffs)

branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.cpp

@@ -2633 +2633 @@
   CommonDecoderParams* params = this->getCommonDecoderParams();
 
-#if !FIX_CONF_MODE
-  assert( params->getTargetLayerId() < vps->getMaxLayers() );
-#endif
-
   if( params->getValueCheckedFlag() )
   {
@@ -2739 +2735 @@
 
   }
-#if FIX_CONF_MODE
+
   // Set correct value of targetLayerId
   Int targetOlsIdx = params->getTargetOutputLayerSetIdx();
   Int targetLsIdx = vps->getOutputLayerSetIdx( targetOlsIdx );
   params->setTargetLayerId( vps->getLayerSetLayerIdList( targetLsIdx, vps->getNumLayersInIdList(targetLsIdx)-1 ) );
-#endif
+
 #if FIX_NON_OUTPUT_LAYER
   // Check if the current layer is an output layer