Changeset 1106 in SHVCSoftware

Timestamp:

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

Author:

seregin

Message:

macro cleanup: FIX_CONF_MODE

Location:

branches/SHM-dev/source

Files:

• App/TAppDecoder/TAppDecCfg.cpp (modified) (4 diffs)
• App/TAppDecoder/TAppDecTop.cpp (modified) (9 diffs)
• Lib/TLibCommon/CommonDef.h (modified) (1 diff)
• Lib/TLibCommon/TypeDef.h (modified) (1 diff)
• Lib/TLibDecoder/TDecTop.cpp (modified) (2 diffs)

branches/SHM-dev/source/App/TAppDecoder/TAppDecCfg.cpp

@@ -102 +102 @@
 #endif
 #endif
-#if FIX_CONF_MODE
   ("TargetLayerId,-lid", targetLayerId, -1, "Target layer id")
   ("LayerNum,-ls", layerNum, MAX_NUM_LAYER_IDS, "Target layer id") // Legacy option
-#else
-  ("LayerNum,-ls", nLayerNum, 1, "Number of layers to be decoded.")
-#endif
 #if OUTPUT_LAYER_SET_INDEX
   ("OutpuLayerSetIdx,-olsidx", olsIdx, -1, "Index of output layer set to be decoded.")
@@ -172 +168 @@
 
   assert( targetLayerId >= 0 );
-#if !FIX_CONF_MODE
-  assert( m_tgtLayerId < MAX_LAYERS );  // If this is wrong, it should be caught by asserts in other locations.
-#endif
 #if O0137_MAX_LAYERID
   assert( targetLayerId < MAX_NUM_LAYER_IDS );
@@ -199 +192 @@
 
     // Decoded layer YUV files
-#if FIX_CONF_MODE
     for(Int layer= 0; layer < MAX_VPS_LAYER_IDX_PLUS1; layer++ )
-#else
-    for(UInt layer=0; layer<= m_tgtLayerId; layer++)
-#endif
     {
       sprintf(fileNameSuffix, "%s-L%d.yuv", m_confPrefix.c_str(), layer);  // olsIdx is the target output layer set index.
@@ -214 +203 @@
   m_commonDecoderParams.setTargetLayerId( targetLayerId );
 #endif
-#if FIX_CONF_MODE
+#if CONFORMANCE_BITSTREAM_MODE
   for(Int layer = 0; layer < MAX_VPS_LAYER_IDX_PLUS1; layer++ )
   {

branches/SHM-dev/source/App/TAppDecoder/TAppDecTop.cpp

@@ -94 +94 @@
   }
 #if SVC_EXTENSION
-#if FIX_CONF_MODE
+#if CONFORMANCE_BITSTREAM_MODE
   for(Int i = 0; i < MAX_VPS_LAYER_IDX_PLUS1; i++ )
 #else
@@ -174 +174 @@
   memset( loopFiltered, false, sizeof( loopFiltered ) );
 
-#if FIX_CONF_MODE
+#if CONFORMANCE_BITSTREAM_MODE
   for(UInt layer = 0; layer < MAX_VPS_LAYER_IDX_PLUS1; layer++)
 #else
@@ -234 +234 @@
       read(nalu, nalUnit);
       if( (m_iMaxTemporalLayer >= 0 && nalu.m_temporalId > m_iMaxTemporalLayer) || !isNaluWithinTargetDecLayerIdSet(&nalu)  ||
-#if FIX_CONF_MODE
+#if CONFORMANCE_BITSTREAM_MODE
         (nalu.m_layerId > m_commonDecoderParams.getTargetLayerId()) )
 #else
@@ -415 +415 @@
   pcBLPic.destroy();
 
-#if FIX_CONF_MODE
+#if CONFORMANCE_BITSTREAM_MODE
   for(UInt layer = layerIdxmin; layer < MAX_VPS_LAYER_IDX_PLUS1; layer++)
 #else
@@ -604 +604 @@
   initROM();
 
-#if FIX_CONF_MODE
+#if CONFORMANCE_BITSTREAM_MODE
   for(UInt layer = 0; layer < MAX_VPS_LAYER_IDX_PLUS1; layer++)
 #else
@@ -630 +630 @@
   destroyROM();
 
-#if FIX_CONF_MODE
+#if CONFORMANCE_BITSTREAM_MODE
   for(UInt layer = 0; layer < MAX_VPS_LAYER_IDX_PLUS1; layer++)
 #else
@@ -659 +659 @@
   // initialize decoder class
 #if SVC_EXTENSION
-#if FIX_CONF_MODE
+#if CONFORMANCE_BITSTREAM_MODE
   for(UInt layer = 0; layer < MAX_VPS_LAYER_IDX_PLUS1; layer++)
 #else
@@ -667 +667 @@
     m_acTDecTop[layer].init();
     m_acTDecTop[layer].setDecodedPictureHashSEIEnabled(m_decodedPictureHashSEIEnabled);
-#if FIX_CONF_MODE
+#if CONFORMANCE_BITSTREAM_MODE
     m_acTDecTop[layer].setNumLayer( MAX_LAYERS );
 #else
@@ -677 +677 @@
   }
 #if CONFORMANCE_BITSTREAM_MODE
-#if FIX_CONF_MODE
   for(UInt layer = 0; layer < MAX_VPS_LAYER_IDX_PLUS1; layer++)
-#else
-  for(UInt layer = 0; layer < MAX_LAYERS; layer++)
-#endif
   {
     m_acTDecTop[layer].setConfModeFlag( m_confModeFlag );

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