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

Timestamp:

19 Dec 2013, 03:10:48 (11 years ago)

Author:

qualcomm

Message:

JCTVC-O0217: Output layer set index at the decoder (MACRO: OUTPUT_LAYER_SET_INDEX)

Patch includes output layer set index inference at the decoder.

From: Adarsh K. Ramasubramonian <aramasub@…>

Location:

branches/SHM-4.1-dev/source/App/TAppDecoder

Files:

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

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

@@ -69 +69 @@
   string cfg_ReconFile [MAX_LAYERS];
   Int nLayerNum;
+#if OUTPUT_LAYER_SET_INDEX
+  Int olsIdx;
+#endif
 #if AVC_BASE
   string cfg_BLReconFile;
@@ -110 +113 @@
 #if SVC_EXTENSION
   ("LayerNum,-ls", nLayerNum, 1, "Number of layers to be decoded.")
+#if OUTPUT_LAYER_SET_INDEX
+  ("OutpuLayerSetIdx,-olsidx", olsIdx, -1, "Index of output layer set to be decoded.")
+#endif
 #endif 
   ("MaxTemporalLayer,t", m_iMaxTemporalLayer, -1, "Maximum Temporal Layer to be decoded. -1 to decode all layers")
@@ -138 +144 @@
   m_tgtLayerId = nLayerNum - 1;
   assert( m_tgtLayerId >= 0 );
+#if OUTPUT_LAYER_SET_INDEX  
+  this->getCommonDecoderParams()->setOutputLayerSetIdx( olsIdx       );
+  this->getCommonDecoderParams()->setTargetLayerId    ( m_tgtLayerId );
+#endif
   for(UInt layer=0; layer<= m_tgtLayerId; layer++)
   {
@@ -201 +211 @@
       fprintf(stderr, "File %s could not be opened. Using all LayerIds as default.\n", cfg_TargetDecLayerIdSetFile.c_str() );
     }
+#if OUTPUT_LAYER_SET_INDEX  
+    this->getCommonDecoderParams()->setTargetDecLayerIdSet( &m_targetDecLayerIdSet );
+#endif
   }
 

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

@@ -91 +91 @@
   std::vector<Int> m_targetDecLayerIdSet;             ///< set of LayerIds to be included in the sub-bitstream extraction process.
   Int           m_respectDefDispWindow;               ///< Only output content inside the default display window 
+#if OUTPUT_LAYER_SET_INDEX
+  CommonDecoderParams             m_commonDecoderParams;
+#endif
 
 public:
@@ -120 +123 @@
   
   Bool  parseCfg        ( Int argc, Char* argv[] );   ///< initialize option class from configuration
+#if OUTPUT_LAYER_SET_INDEX
+  CommonDecoderParams* getCommonDecoderParams() {return &m_commonDecoderParams;}
+#endif
 };
 

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

@@ -494 +494 @@
     m_acTDecTop[layer].setDecodedPictureHashSEIEnabled(m_decodedPictureHashSEIEnabled);
     m_acTDecTop[layer].setNumLayer( m_tgtLayerId + 1 );
+#if OUTPUT_LAYER_SET_INDEX
+    m_acTDecTop[layer].setCommonDecoderParams( this->getCommonDecoderParams() );
+#endif
   }