Changeset 1334 in SHVCSoftware for branches/SHM-dev/source/Lib

Timestamp:

22 Jul 2015, 01:55:58 (9 years ago)

Author:

seregin

Message:

port rev 4412

Location:

branches/SHM-dev/source/Lib

Files:

• TLibCommon/TypeDef.h (modified) (2 diffs)
• TLibEncoder/TEncCfg.h (modified) (2 diffs)
• TLibEncoder/TEncGOP.cpp (modified) (3 diffs)

branches/SHM-dev/source/Lib/TLibCommon/TypeDef.h

@@ -248 +248 @@
 #endif
 
-#define VERBOSE_RATE 0 ///< Print additional rate information in encoder
-
 #define AMVP_DECIMATION_FACTOR                            4
 
@@ -279 +277 @@
 #define MDCS_MAXIMUM_WIDTH                                8         ///< (default 8) (measured in pixels) TUs with width greater than this can only use diagonal scan
 #define MDCS_MAXIMUM_HEIGHT                               8         ///< (default 8) (measured in pixels) TUs with height greater than this can only use diagonal scan
-
-#define FAST_UDI_USE_MPM 1
 
 #define RDO_WITHOUT_DQP_BITS                              0           ///< Disable counting dQP bits in RDO-based mode decision

branches/SHM-dev/source/Lib/TLibEncoder/TEncCfg.h

@@ -382 +382 @@
   std::string m_summaryOutFilename;                           ///< filename to use for producing summary output file.
   std::string m_summaryPicFilenameBase;                       ///< Base filename to use for producing summary picture output files. The actual filenames used will have I.txt, P.txt and B.txt appended.
+  UInt        m_summaryVerboseness;                           ///< Specifies the level of the verboseness of the text output.
 
 #if SVC_EXTENSION
@@ -1028 +1029 @@
   Void      setSummaryPicFilenameBase(const std::string &s)          { m_summaryPicFilenameBase = s; }
   const std::string& getSummaryPicFilenameBase() const               { return m_summaryPicFilenameBase; }
+  Void      setSummaryVerboseness(UInt v)                            { m_summaryVerboseness = v; }
+  UInt      getSummaryVerboseness( ) const                           { return m_summaryVerboseness; }
 
 #if Q0189_TMVP_CONSTRAINTS

branches/SHM-dev/source/Lib/TLibEncoder/TEncGOP.cpp

@@ -3077 +3077 @@
 }
 
-#if VERBOSE_RATE
 static const Char* nalUnitTypeToString(NalUnitType type)
 {
@@ -3110 +3109 @@
   }
 }
-#endif
 
 Void TEncGOP::xCalculateAddPSNRs( const Bool isField, const Bool isFieldTopFieldFirst, const Int iGOPid, TComPic* pcPic, const AccessUnit&accessUnit, TComList<TComPic*> &rcListPic, const Double dEncTime, const InputColourSpaceConversion snr_conversion, const Bool printFrameMSE )
@@ -3242 +3240 @@
   {
     UInt numRBSPBytes_nal = UInt((*it)->m_nalUnitData.str().size());
-#if VERBOSE_RATE
-    printf("*** %6s numBytesInNALunit: %u\n", nalUnitTypeToString((*it)->m_nalUnitType), numRBSPBytes_nal);
-#endif
+    if (m_pcCfg->getSummaryVerboseness() > 0)
+    {
+      printf("*** %6s numBytesInNALunit: %u\n", nalUnitTypeToString((*it)->m_nalUnitType), numRBSPBytes_nal);
+    }
     if ((*it)->m_nalUnitType != NAL_UNIT_PREFIX_SEI && (*it)->m_nalUnitType != NAL_UNIT_SUFFIX_SEI)
     {