Changeset 738 in 3DVCSoftware for trunk/source/App/TAppDecoder/TAppDecCfg.cpp

Timestamp:

10 Dec 2013, 13:50:12 (10 years ago)

Author:

tech

Message:

Merged HTM-9.0-dev0@731. (MV-HEVC 6 HLS)

File:

• trunk/source/App/TAppDecoder/TAppDecCfg.cpp (modified) (4 diffs)

trunk/source/App/TAppDecoder/TAppDecCfg.cpp

@@ -85 +85 @@
   ("OutputBitDepthC,d", m_outputBitDepthC, 0, "bit depth of YUV output chroma component (default: use 0 for native depth)")
 #if H_MV
+#if H_MV_6_HRD_O0217_13
+  ("TargetOptLayerSetIdx,x", m_targetOptLayerSetIdx, -1, "Target output layer set index. (default: -1, determine automatically to be equal to highest layer set index") // Should actually equal to 0 as default. However, this would cause only the base layer to be decoded.  
+#else
   ("MaxLayerId,-ls", m_maxLayerId, MAX_NUM_LAYER_IDS-1, "Maximum LayerId to be decoded.")
+#endif
 #endif
   ("MaxTemporalLayer,t", m_iMaxTemporalLayer, -1, "Maximum Temporal Layer to be decoded. -1 to decode all layers")
@@ -124 +128 @@
   if ( !cfg_TargetDecLayerIdSetFile.empty() )
   {
+#if H_MV_6_HRD_O0217_13
+    m_targetDecLayerIdSetFileEmpty = false;     
+#endif
     FILE* targetDecLayerIdSetFile = fopen ( cfg_TargetDecLayerIdSetFile.c_str(), "r" );
     if ( targetDecLayerIdSetFile )
@@ -167 +174 @@
   }
 #if H_MV
+#if H_MV_6_HRD_O0217_13
+  m_targetDecLayerIdSet.push_back( 0 );         // Only base layer at startup
+#else
   else
   {
@@ -174 +184 @@
     }
   }
+#endif
 #endif