Changeset 773 in 3DVCSoftware for trunk/source/App/TAppDecoder/TAppDecCfg.h

Timestamp:

16 Jan 2014, 09:56:13 (10 years ago)

Author:

tech

Message:

Merged branch/9.2-dev0@722.

File:

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

trunk/source/App/TAppDecoder/TAppDecCfg.h

@@ -59 +59 @@
   Char*         m_pchBitstreamFile;                   ///< input bitstream file name
 #if H_MV
-#if H_MV_6_HRD_O0217_13
   Int           m_targetOptLayerSetIdx;               ///< target output layer set index
-#endif
   Int           m_maxLayerId;                         ///< maximum nuh_layer_id decoded
   std::vector<Char*> m_pchReconFiles;                 ///< array of output reconstruction file name create from output reconstruction file name
@@ -77 +75 @@
 
   std::vector<Int> m_targetDecLayerIdSet;             ///< set of LayerIds to be included in the sub-bitstream extraction process.
-#if H_MV_6_HRD_O0217_13
+#if H_MV
   Bool          m_targetDecLayerIdSetFileEmpty;      ///< indication if target layers are given by file
 #endif
@@ -88 +86 @@
   TAppDecCfg()
   : m_pchBitstreamFile(NULL)
-#if H_MV
-#if !H_MV_6_HRD_O0217_13
-  , m_maxLayerId(0)
-#endif
-#endif
   , m_pchReconFile(NULL)
   , m_iSkipFrame(0)
@@ -99 +92 @@
   , m_iMaxTemporalLayer(-1)
   , m_decodedPictureHashSEIEnabled(0)
-#if H_MV_6_HRD_O0217_13
+#if H_MV
   , m_targetDecLayerIdSetFileEmpty(true)
 #endif