Changeset 1356 in 3DVCSoftware for trunk/source/App/TAppDecoder

Timestamp:

27 Oct 2015, 11:33:16 (9 years ago)

Author:

tech

Message:

Merged 15.1-dev0-NICT@1355.

Location:

trunk/source/App/TAppDecoder

Files:

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

trunk/source/App/TAppDecoder/TAppDecCfg.cpp ¶

@@ -109 +109 @@
   ("ForceDecodeBitDepth",       m_forceDecodeBitDepth,                 0U,         "Force the decoder to operate at a particular bit-depth (best effort decoding)")
 #endif
+#if NH_MV_SEI
+  ("OutputDecodedSEIMessagesFilename,m",  m_outputDecodedSEIMessagesFilename,    string(""), "When non empty, output decoded SEI messages to the indicated file. If file is '-', then output to stdout\n")
+#else
   ("OutputDecodedSEIMessagesFilename",  m_outputDecodedSEIMessagesFilename,    string(""), "When non empty, output decoded SEI messages to the indicated file. If file is '-', then output to stdout\n")
+#endif
   ("ClipOutputVideoToRec709Range",      m_bClipOutputVideoToRec709Range,  false, "If true then clip output video to the Rec. 709 Range on saving")
   ;

trunk/source/App/TAppDecoder/TAppDecCfg.h ¶

@@ -82 +82 @@
   Int           m_targetOptLayerSetIdx;                 ///< target output layer set index
   Int           m_targetDecLayerSetIdx;
-  Int           m_baseLayerOutputFlag; 
-  Int           m_baseLayerPicOutputFlag; 
-  Int           m_auOutputFlag; 
+  Int           m_baseLayerOutputFlag;
+  Int           m_baseLayerPicOutputFlag;
+  Int           m_auOutputFlag;
   Int           m_maxLayerId;                           ///< maximum nuh_layer_id decoded
-  std::ifstream m_bitstreamFile; 
+  std::ifstream m_bitstreamFile;
   Int           m_highestTid;
   Bool          m_targetDecLayerIdSetFileEmpty;       ///< indication if target layers are given by file
 
-  Bool          m_printVpsInfo;                      ///< Output VPS information 
+  Bool          m_printVpsInfo;                      ///< Output VPS information
   Bool          m_printPicOutput;                     ///< Print information on picture output
   Bool          m_printReceivedNalus;                 ///< Print information on received NAL units
@@ -124 +124 @@
       m_outputBitDepth[channelTypeIndex] = 0;
     }
+#if NH_3D
+    m_pchScaleOffsetFile = NULL;
+#endif
   }