From 61ccc85de37cf4bf38798cfff3ec6a1cff614bb7 Mon Sep 17 00:00:00 2001
From: Jonatan Samuelsson <jonatan.samuelsson@divideon.com>
Date: Mon, 4 May 2020 18:26:26 +0200
Subject: [PATCH] adding pps_ prefix to affected syntax elements
---
source/Lib/CommonLib/UnitTools.cpp | 4 ++--
source/Lib/DecoderLib/VLCReader.cpp | 8 ++++----
source/Lib/EncoderLib/VLCWriter.cpp | 8 ++++----
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/source/Lib/CommonLib/UnitTools.cpp b/source/Lib/CommonLib/UnitTools.cpp
index 4cfaa1eeb..444ff8b32 100644
--- a/source/Lib/CommonLib/UnitTools.cpp
+++ b/source/Lib/CommonLib/UnitTools.cpp
@@ -128,8 +128,8 @@ bool CU::getRprScaling( const SPS* sps, const PPS* curPPS, Picture* refPic, int&
CHECK(curPicHeight > refPicHeight * 8, "curPicHeight shall be less than or equal to refPicHeight * 8");
#if JVET_R0114_NEGATIVE_SCALING_WINDOW_OFFSETS
- CHECK(SPS::getWinUnitX(sps->getChromaFormatIdc()) * (abs(curScalingWindow.getWindowLeftOffset()) + abs(curScalingWindow.getWindowRightOffset())) > curPPS->getPicWidthInLumaSamples(), "The value of SubWidthC * ( Abs(scaling_win_left_offset) + Abs(scaling_win_right_offset) ) shall be less than pic_width_in_luma_samples");
- CHECK(SPS::getWinUnitY(sps->getChromaFormatIdc()) * (abs(curScalingWindow.getWindowTopOffset()) + abs(curScalingWindow.getWindowBottomOffset())) > curPPS->getPicHeightInLumaSamples(), "The value of SubHeightC * ( Abs(scaling_win_top_offset) + Abs(scaling_win_bottom_offset) ) shall be less than pic_height_in_luma_samples");
+ CHECK(SPS::getWinUnitX(sps->getChromaFormatIdc()) * (abs(curScalingWindow.getWindowLeftOffset()) + abs(curScalingWindow.getWindowRightOffset())) > curPPS->getPicWidthInLumaSamples(), "The value of SubWidthC * ( Abs(pps_scaling_win_left_offset) + Abs(pps_scaling_win_right_offset) ) shall be less than pic_width_in_luma_samples");
+ CHECK(SPS::getWinUnitY(sps->getChromaFormatIdc()) * (abs(curScalingWindow.getWindowTopOffset()) + abs(curScalingWindow.getWindowBottomOffset())) > curPPS->getPicHeightInLumaSamples(), "The value of SubHeightC * ( Abs(pps_scaling_win_top_offset) + Abs(pps_scaling_win_bottom_offset) ) shall be less than pic_height_in_luma_samples");
#endif
return refPic->isRefScaled( curPPS );
diff --git a/source/Lib/DecoderLib/VLCReader.cpp b/source/Lib/DecoderLib/VLCReader.cpp
index 71bbcc93c..b254d00ef 100644
--- a/source/Lib/DecoderLib/VLCReader.cpp
+++ b/source/Lib/DecoderLib/VLCReader.cpp
@@ -453,10 +453,10 @@ void HLSyntaxReader::parsePPS( PPS* pcPPS )
{
Window &scalingWindow = pcPPS->getScalingWindow();
#if JVET_R0114_NEGATIVE_SCALING_WINDOW_OFFSETS
- READ_SVLC( iCode, "scaling_win_left_offset" ); scalingWindow.setWindowLeftOffset( iCode );
- READ_SVLC( iCode, "scaling_win_right_offset" ); scalingWindow.setWindowRightOffset( iCode );
- READ_SVLC( iCode, "scaling_win_top_offset" ); scalingWindow.setWindowTopOffset( iCode );
- READ_SVLC( iCode, "scaling_win_bottom_offset" ); scalingWindow.setWindowBottomOffset( iCode );
+ READ_SVLC( iCode, "pps_scaling_win_left_offset" ); scalingWindow.setWindowLeftOffset( iCode );
+ READ_SVLC( iCode, "pps_scaling_win_right_offset" ); scalingWindow.setWindowRightOffset( iCode );
+ READ_SVLC( iCode, "pps_scaling_win_top_offset" ); scalingWindow.setWindowTopOffset( iCode );
+ READ_SVLC( iCode, "pps_scaling_win_bottom_offset" ); scalingWindow.setWindowBottomOffset( iCode );
#else
READ_UVLC( uiCode, "scaling_win_left_offset" ); scalingWindow.setWindowLeftOffset( uiCode );
READ_UVLC( uiCode, "scaling_win_right_offset" ); scalingWindow.setWindowRightOffset( uiCode );
diff --git a/source/Lib/EncoderLib/VLCWriter.cpp b/source/Lib/EncoderLib/VLCWriter.cpp
index 5e38f6c07..fbfcb51bc 100644
--- a/source/Lib/EncoderLib/VLCWriter.cpp
+++ b/source/Lib/EncoderLib/VLCWriter.cpp
@@ -278,10 +278,10 @@ void HLSWriter::codePPS( const PPS* pcPPS )
if( scalingWindow.getWindowEnabledFlag() )
{
#if JVET_R0114_NEGATIVE_SCALING_WINDOW_OFFSETS
- WRITE_SVLC( scalingWindow.getWindowLeftOffset(), "scaling_win_left_offset" );
- WRITE_SVLC( scalingWindow.getWindowRightOffset(), "scaling_win_right_offset" );
- WRITE_SVLC( scalingWindow.getWindowTopOffset(), "scaling_win_top_offset" );
- WRITE_SVLC( scalingWindow.getWindowBottomOffset(), "scaling_win_bottom_offset" );
+ WRITE_SVLC( scalingWindow.getWindowLeftOffset(), "pps_scaling_win_left_offset" );
+ WRITE_SVLC( scalingWindow.getWindowRightOffset(), "pps_scaling_win_right_offset" );
+ WRITE_SVLC( scalingWindow.getWindowTopOffset(), "pps_scaling_win_top_offset" );
+ WRITE_SVLC( scalingWindow.getWindowBottomOffset(), "pps_scaling_win_bottom_offset" );
#else
WRITE_UVLC( scalingWindow.getWindowLeftOffset(), "scaling_win_left_offset" );
WRITE_UVLC( scalingWindow.getWindowRightOffset(), "scaling_win_right_offset" );
--
GitLab