Changeset 1057 in SHVCSoftware for branches/SHM-dev/source/App/TAppDecoder

Timestamp:

4 Mar 2015, 09:55:40 (10 years ago)

Author:

seregin

Message:

revert back using layerIdx for m_ppcTEncTop, fix RefLayerId settings and related

Location:

branches/SHM-dev/source/App/TAppDecoder

Files:

• TAppDecCfg.cpp (modified) (4 diffs)
• TAppDecCfg.h (modified) (2 diffs)
• TAppDecTop.cpp (modified) (1 diff)

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

@@ -69 +69 @@
 #if SVC_EXTENSION
   string cfg_ReconFile [MAX_LAYERS];
-  Int nLayerNum;
+  Int layerNum, targetLayerId;
 #if OUTPUT_LAYER_SET_INDEX
   Int olsIdx;
@@ -103 +103 @@
 #endif
 #if FIX_CONF_MODE
-  ("LayerNum,-ls", nLayerNum, MAX_NUM_LAYER_IDS, "Number of layers to be decoded.")
+  ("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.")
@@ -165 +166 @@
   m_pchBitstreamFile = cfg_BitstreamFile.empty() ? NULL : strdup(cfg_BitstreamFile.c_str());
 #if SVC_EXTENSION
-  m_tgtLayerId = nLayerNum - 1;
-  assert( m_tgtLayerId >= 0 );
+  if( targetLayerId < 0 )
+  {
+    targetLayerId = layerNum - 1;
+  }
+
+  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( m_tgtLayerId < MAX_NUM_LAYER_IDS );
+  assert( targetLayerId < MAX_NUM_LAYER_IDS );
 #endif
 #if OUTPUT_LAYER_SET_INDEX
@@ -207 +212 @@
 #endif
   m_commonDecoderParams.setTargetOutputLayerSetIdx( olsIdx );
-  m_commonDecoderParams.setTargetLayerId( m_tgtLayerId );
+  m_commonDecoderParams.setTargetLayerId( targetLayerId );
 #endif
 #if FIX_CONF_MODE

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

@@ -75 +75 @@
 
 #if SVC_EXTENSION
-  Int           m_tgtLayerId;                        ///< target layer ID
 #if AVC_BASE
   Char*         m_pchBLReconFile;                     ///< input BL reconstruction file name
@@ -118 +117 @@
 #endif
 #if SVC_EXTENSION
-  , m_tgtLayerId(0)
 #if AVC_BASE && !REPN_FORMAT_IN_VPS
   , m_iBLSourceWidth(0)

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

@@ -223 +223 @@
       if( (m_iMaxTemporalLayer >= 0 && nalu.m_temporalId > m_iMaxTemporalLayer) || !isNaluWithinTargetDecLayerIdSet(&nalu)  ||
 #if FIX_CONF_MODE
-        (nalu.m_layerId > this->getCommonDecoderParams()->getTargetLayerId()) )
+        (nalu.m_layerId > m_commonDecoderParams.getTargetLayerId()) )
 #else
         (nalu.m_layerId > m_tgtLayerId) )