diff --git a/source/Lib/CommonLib/Slice.h b/source/Lib/CommonLib/Slice.h index cd71ed5b562a44ee3440e8541c448700ea873fa5..f29cb8e06500582f9eba4d4a1c2fca326cd4475b 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 e46c6fcc463851ee79c0fde4a3820a08689cb60a..9538429661ed89c0b8a9f8c3e684b46fed4b2121 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))