Changeset 1412 in 3DVCSoftware for branches/HTM-16.2-dev/source/Lib/TLibEncoder/TEncAnalyze.h

Timestamp:

12 Apr 2018, 11:12:21 (7 years ago)

Author:

tech

Message:

• Update HM-16.18
• Cleanups
• Encoder Extension

-- Representation formats
-- Parameter set sharing
-- GOP configuration

File:

• branches/HTM-16.2-dev/source/Lib/TLibEncoder/TEncAnalyze.h (modified) (16 diffs)

branches/HTM-16.2-dev/source/Lib/TLibEncoder/TEncAnalyze.h

@@ -4 +4 @@
  * granted under this license.
  *
- * Copyright (c) 2010-2016, ITU/ISO/IEC
+ * Copyright (c) 2010-2017, ITU/ISO/IEC
  * All rights reserved.
  *
@@ -49 +49 @@
 #include "TLibCommon/TComChromaFormat.h"
 #include "math.h"
+#if EXTENSION_360_VIDEO
+#include "TAppEncHelper360/TExt360EncAnalyze.h"
+#endif
 
 //! \ingroup TLibEncoder
@@ -66 +69 @@
   Double    m_dFrmRate; //--CFG_KDY
   Double    m_MSEyuvframe[MAX_NUM_COMPONENT]; // sum of MSEs
+#if JVET_F0064_MSSSIM
+  Double    m_MSSSIM[MAX_NUM_COMPONENT];
+#endif
+
+#if EXTENSION_360_VIDEO
+  TExt360EncAnalyze m_ext360;
+#endif
 
 public:
@@ -71 +81 @@
   TEncAnalyze() { clear(); }
 
-  Void  addResult( Double psnr[MAX_NUM_COMPONENT], Double bits, const Double MSEyuvframe[MAX_NUM_COMPONENT])
-  {
+#if JVET_F0064_MSSSIM
+  Void  addResult( Double psnr[MAX_NUM_COMPONENT], Double bits, const Double MSEyuvframe[MAX_NUM_COMPONENT], const Double MSSSIM[MAX_NUM_COMPONENT] )  {
+#else
+  Void  addResult( Double psnr[MAX_NUM_COMPONENT], Double bits, const Double MSEyuvframe[MAX_NUM_COMPONENT] )  {
+#endif
     m_dAddBits  += bits;
     for(UInt i=0; i<MAX_NUM_COMPONENT; i++)
@@ -78 +91 @@
       m_dPSNRSum[i] += psnr[i];
       m_MSEyuvframe[i] += MSEyuvframe[i];
+#if JVET_F0064_MSSSIM
+      m_MSSSIM[i] += MSSSIM[i];
+#endif
     }
 
@@ -84 +100 @@
 
   Double  getPsnr(ComponentID compID) const { return  m_dPSNRSum[compID];  }
+#if JVET_F0064_MSSSIM
+  Double  getMsssim(ComponentID compID) const { return  m_MSSSIM[compID];  }
+#endif
   Double  getBits()                   const { return  m_dAddBits;   }
   Void    setBits(Double numBits)     { m_dAddBits=numBits; }
   UInt    getNumPic()                 const { return  m_uiNumPic;   }
+#if EXTENSION_360_VIDEO
+  TExt360EncAnalyze& getExt360Info() { return m_ext360; }
+#endif
 
   Void    setFrmRate  (Double dFrameRate) { m_dFrmRate = dFrameRate; } //--CFG_KDY
@@ -96 +118 @@
       m_dPSNRSum[i] = 0;
       m_MSEyuvframe[i] = 0;
+#if JVET_F0064_MSSSIM
+      m_MSSSIM[i] = 0;
+#endif
     }
     m_uiNumPic = 0;
+#if EXTENSION_360_VIDEO
+    m_ext360.clear();
+#endif
   }
 
@@ -137 +165 @@
 
 
+#if JVET_F0064_MSSSIM
+  Void    printOut ( TChar cDelim, const ChromaFormat chFmt, const Bool printMSEBasedSNR, const Bool printSequenceMSE, const Bool printMSSSIM, const BitDepths &bitDepths )
+#else
   Void    printOut ( TChar cDelim, const ChromaFormat chFmt, const Bool printMSEBasedSNR, const Bool printSequenceMSE, const BitDepths &bitDepths )
+#endif
   {
     Double dFps     =   m_dFrmRate; //--CFG_KDY
@@ -171 +203 @@
           printf( "         \tTotal Frames |   "   "Bitrate     "  "Y-PSNR" );
 
+#if JVET_F0064_MSSSIM
+          if (printMSSSIM)
+          {
+            printf( "    Y-MS-SSIM");
+          }
+#endif
           if (printSequenceMSE)
           {
@@ -186 +224 @@
                  getPsnr(COMPONENT_Y) / (Double)getNumPic() );
 
+#if JVET_F0064_MSSSIM
+          if (printMSSSIM)
+          {
+            printf("    %8.6lf", getMsssim(COMPONENT_Y) / (Double)getNumPic());
+          }
+#endif
+
           if (printSequenceMSE)
           {
@@ -203 +248 @@
         {
           printf( "\tTotal Frames |   "   "Bitrate     "  "Y-PSNR" );
+
+#if JVET_F0064_MSSSIM
+          if (printMSSSIM)
+          {
+            printf( "Y-MS-SSIM");
+          }
+#endif
 
           if (printSequenceMSE)
@@ -219 +271 @@
                  getPsnr(COMPONENT_Y) / (Double)getNumPic() );
 
+#if JVET_F0064_MSSSIM
+          if (printMSSSIM)
+          {
+            printf("%8.6lf", getMsssim(COMPONENT_Y) / (Double)getNumPic());
+          }
+#endif
           if (printSequenceMSE)
           {
@@ -242 +300 @@
             printf( "         \tTotal Frames |   "   "Bitrate     "  "Y-PSNR    "  "U-PSNR    "  "V-PSNR    "  "YUV-PSNR " );
 
+#if JVET_F0064_MSSSIM
+            if (printMSSSIM)
+            {
+              printf("   Y-MS-SSIM    " "U-MS-SSIM    " "V-MS-SSIM ");
+            }
+#endif
             if (printSequenceMSE)
             {
@@ -260 +324 @@
                    PSNRyuv );
 
+#if JVET_F0064_MSSSIM
+            if (printMSSSIM)
+            {
+              printf("    %8.6lf     " "%8.6lf     " "%8.6lf ",
+                     getMsssim(COMPONENT_Y) / (Double)getNumPic(),
+                     getMsssim(COMPONENT_Cb) / (Double)getNumPic(),
+                     getMsssim(COMPONENT_Cr) / (Double)getNumPic());
+            }
+#endif
             if (printSequenceMSE)
             {
@@ -285 +358 @@
             printf( "\tTotal Frames |   "   "Bitrate     "  "Y-PSNR    "  "U-PSNR    "  "V-PSNR    "  "YUV-PSNR " );
             
+#if JVET_F0064_MSSSIM
+            if (printMSSSIM)
+            {
+              printf("   Y-MS-SSIM    " "U-MS-SSIM    " "V-MS-SSIM ");
+            }
+#endif
+
+#if EXTENSION_360_VIDEO
+            m_ext360.printHeader();
+#endif
+
             if (printSequenceMSE)
             {
@@ -303 +387 @@
                    PSNRyuv );
 
+#if JVET_F0064_MSSSIM
+            if (printMSSSIM)
+            {
+              printf("    %8.6lf     " "%8.6lf     " "%8.6lf ",
+                     getMsssim(COMPONENT_Y) / (Double)getNumPic(),
+                     getMsssim(COMPONENT_Cb) / (Double)getNumPic(),
+                     getMsssim(COMPONENT_Cr) / (Double)getNumPic());
+            }
+#endif
+
+#if EXTENSION_360_VIDEO
+            m_ext360.printPSNRs(getNumPic());
+#endif
+
             if (printSequenceMSE)
             {