Changeset 768 in 3DVCSoftware for branches/HTM-9.2-dev0/source/App/TAppDecoder

Timestamp:

13 Jan 2014, 00:44:19 (11 years ago)

Author:

tech

Message:

Further fixes.

Location:

branches/HTM-9.2-dev0/source/App/TAppDecoder

Files:

• TAppDecCfg.cpp (modified) (1 diff)
• TAppDecCfg.h (modified) (3 diffs)

branches/HTM-9.2-dev0/source/App/TAppDecoder/TAppDecCfg.cpp

@@ -124 +124 @@
   if ( !cfg_TargetDecLayerIdSetFile.empty() )
   {
+#if H_MV
     m_targetDecLayerIdSetFileEmpty = false;     
+#endif
     FILE* targetDecLayerIdSetFile = fopen ( cfg_TargetDecLayerIdSetFile.c_str(), "r" );
     if ( targetDecLayerIdSetFile )

branches/HTM-9.2-dev0/source/App/TAppDecoder/TAppDecCfg.h

@@ -75 +75 @@
 
   std::vector<Int> m_targetDecLayerIdSet;             ///< set of LayerIds to be included in the sub-bitstream extraction process.
+#if H_MV
   Bool          m_targetDecLayerIdSetFileEmpty;      ///< indication if target layers are given by file
+#endif
   Int           m_respectDefDispWindow;               ///< Only output content inside the default display window 
 
@@ -84 +86 @@
   TAppDecCfg()
   : m_pchBitstreamFile(NULL)
-#if H_MV
-#endif
   , m_pchReconFile(NULL)
   , m_iSkipFrame(0)
@@ -92 +92 @@
   , m_iMaxTemporalLayer(-1)
   , m_decodedPictureHashSEIEnabled(0)
+#if H_MV
   , m_targetDecLayerIdSetFileEmpty(true)
+#endif
   , m_respectDefDispWindow(0)
   {}