From a768223e9b5f5ec6996db09f5687b6d32588856d Mon Sep 17 00:00:00 2001
From: Tomonori Hashimoto <tomonori.hashimoto@sharp.co.jp>
Date: Tue, 9 Feb 2021 17:18:30 +0900
Subject: [PATCH] add the new parameter to software manual and change the
condition
---
doc/software-manual.tex | 6 ++++++
source/Lib/EncoderLib/EncGOP.cpp | 6 +++---
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/doc/software-manual.tex b/doc/software-manual.tex
index 970b6301c..15fc589cc 100644
--- a/doc/software-manual.tex
+++ b/doc/software-manual.tex
@@ -752,6 +752,12 @@ When 1, the Mean Square Error (MSE) values of each frame will also be output alo
When 1, the Mean Square Error (MSE) values of the entire sequence will also be output alongside the default PSNR values.
\\
+\Option{PrintWPSNR} &
+%\ShortOption{\None} &
+\Default{false} &
+When 1, weighted PSNR (wPSNR) values of the entire sequence will also be output.
+\\
+
\Option{SummaryOutFilename} &
%\ShortOption{\None} &
\Default{false} &
diff --git a/source/Lib/EncoderLib/EncGOP.cpp b/source/Lib/EncoderLib/EncGOP.cpp
index e6dda73b2..dc7ea4913 100644
--- a/source/Lib/EncoderLib/EncGOP.cpp
+++ b/source/Lib/EncoderLib/EncGOP.cpp
@@ -3686,7 +3686,7 @@ void EncGOP::printOutSummary( uint32_t uiNumAllPicCoded, bool isField, const boo
#endif
#if WCG_WPSNR
#if PRINT_WPSNR
- const bool useLumaWPSNR = m_pcEncLib->getLumaLevelToDeltaQPMapping().isEnabled() || (m_pcCfg->getLmcs() && m_pcCfg->getReshapeSignalType() == RESHAPE_SIGNAL_PQ) || m_pcEncLib->getPrintWPSNR();
+ const bool useLumaWPSNR = m_pcEncLib->getPrintWPSNR();
#else
const bool useLumaWPSNR = m_pcEncLib->getLumaLevelToDeltaQPMapping().isEnabled() || (m_pcCfg->getLmcs() && m_pcCfg->getReshapeSignalType() == RESHAPE_SIGNAL_PQ);
#endif
@@ -4050,7 +4050,7 @@ double EncGOP::xFindDistortionPlaneWPSNR(const CPelBuf& pic0, const CPelBuf& pic
ComponentID compID, const ChromaFormat chfmt )
{
#if PRINT_WPSNR
- const bool useLumaWPSNR = m_pcEncLib->getLumaLevelToDeltaQPMapping().isEnabled() || (m_pcCfg->getLmcs() && m_pcCfg->getReshapeSignalType() == RESHAPE_SIGNAL_PQ) || m_pcEncLib->getPrintWPSNR();
+ const bool useLumaWPSNR = m_pcEncLib->getPrintWPSNR();
#else
const bool useLumaWPSNR = m_pcEncLib->getLumaLevelToDeltaQPMapping().isEnabled() || (m_pcCfg->getLmcs() && m_pcCfg->getReshapeSignalType() == RESHAPE_SIGNAL_PQ);
#endif
@@ -4193,7 +4193,7 @@ void EncGOP::xCalculateAddPSNR(Picture* pcPic, PelUnitBuf cPicD, const AccessUni
double msssim[MAX_NUM_COMPONENT] = {0.0};
#if WCG_WPSNR
#if PRINT_WPSNR
- const bool useLumaWPSNR = m_pcEncLib->getLumaLevelToDeltaQPMapping().isEnabled() || (m_pcCfg->getLmcs() && m_pcCfg->getReshapeSignalType() == RESHAPE_SIGNAL_PQ) || m_pcEncLib->getPrintWPSNR();
+ const bool useLumaWPSNR = m_pcEncLib->getPrintWPSNR();
#else
const bool useLumaWPSNR = m_pcEncLib->getLumaLevelToDeltaQPMapping().isEnabled() || (m_pcCfg->getLmcs() && m_pcCfg->getReshapeSignalType() == RESHAPE_SIGNAL_PQ);
#endif
--
GitLab