From fac76407833a90335e9fabd51028a4aac26ce51b Mon Sep 17 00:00:00 2001
From: Peter Chuang <peter.chuang@mediatek.com>
Date: Wed, 5 Feb 2020 18:28:22 +0800
Subject: [PATCH] Printing a warning at the beginning in case that picture
sizes and the scaling window are defined that could potentially exceed the
constraint
---
source/Lib/CommonLib/Slice.h | 6 +++---
source/Lib/EncoderLib/EncLib.cpp | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/source/Lib/CommonLib/Slice.h b/source/Lib/CommonLib/Slice.h
index cd71ed5b5..f29cb8e06 100644
--- a/source/Lib/CommonLib/Slice.h
+++ b/source/Lib/CommonLib/Slice.h
@@ -1569,9 +1569,9 @@ void setCCALFEnabledFlag( bool b )
#endif
#if JVET_Q0179_SCALING_WINDOW_SIZE_CONSTRAINT
void setPPSValidFlag(int i, bool b) { m_ppsValidFlag[i] = b; }
- bool getPPSValidFlag(int i) { return m_ppsValidFlag[i]; }
- void setScalingWindowSizeInPPS(int i, int scWidth, int scHeight) { m_scalingWindowSizeInPPS[i].width = scWidth; m_scalingWindowSizeInPPS[i].height = scHeight; }
- const Size& getScalingWindowSizeInPPS(int i) { return m_scalingWindowSizeInPPS[i]; }
+ bool getPPSValidFlag(int i) { return m_ppsValidFlag[i]; }
+ void setScalingWindowSizeInPPS(int i, int scWidth, int scHeight) { m_scalingWindowSizeInPPS[i].width = scWidth; m_scalingWindowSizeInPPS[i].height = scHeight;}
+ const Size& getScalingWindowSizeInPPS(int i) { return m_scalingWindowSizeInPPS[i]; }
#endif
};
diff --git a/source/Lib/EncoderLib/EncLib.cpp b/source/Lib/EncoderLib/EncLib.cpp
index e46c6fcc4..953842966 100644
--- a/source/Lib/EncoderLib/EncLib.cpp
+++ b/source/Lib/EncoderLib/EncLib.cpp
@@ -329,7 +329,7 @@ void EncLib::init( bool isFieldCoding, AUWriterIf* auWriterIf )
int curPicWidthY = width; // pic_width_in_luma_samples
int curPicHeightY = height; // pic_height_in_luma_samples
int max8MinCbSizeY = std::max((int)8, (1 << sps0.getLog2MinCodingBlockSize())); // Max(8, MinCbSizeY)
- //Warning message of potential scaling window size violation
+ //Warning message of potential scaling window size violation
for (int i = 0; i < 64; i++)
{
if (sps0.getPPSValidFlag(i))
--
GitLab