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

Timestamp:

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

Author:

seregin

Message:

macro cleanup: FIX_CONF_MODE

Location:

branches/SHM-dev/source/Lib

Files:

• TLibCommon/CommonDef.h (modified) (1 diff)
• TLibCommon/TypeDef.h (modified) (1 diff)
• TLibDecoder/TDecTop.cpp (modified) (2 diffs)

branches/SHM-dev/source/Lib/TLibCommon/CommonDef.h ¶

@@ -316 +316 @@
 public:
   CommonDecoderParams():
-#if FIX_CONF_MODE
+#if CONFORMANCE_BITSTREAM_MODE
     m_targetLayerId(MAX_VPS_LAYER_IDX_PLUS1)
 #else

branches/SHM-dev/source/Lib/TLibCommon/TypeDef.h ¶

@@ -46 +46 @@
 #define MAX_LAYERS                       8      ///< max number of layers the codec is supposed to handle
 #define CONFORMANCE_BITSTREAM_MODE       1      ///< In order to generate the metadata related to conformance bitstreams
-#define FIX_CONF_MODE                    1
 #define FIX_NON_OUTPUT_LAYER             1
 #define SIGNALLING_BITRATE_PICRATE_FIX   1      ///< Fix for signalling of bitrate and picture rate info in VPS VUI to be more aligned to JCTVC-R1008

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