diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h index 5daa072a92d2cf788ea0a92a48613fff4a953276..f5a12fd2d2c1542a1996d1841daf6ede20f1e5de 100644 --- a/source/Lib/CommonLib/TypeDef.h +++ b/source/Lib/CommonLib/TypeDef.h @@ -186,7 +186,6 @@ typedef std::pair<int, int> TrCost; // clang-format on -#define JVET_Q0222_SUBPICTURE_SIGNALLING 1 // JVET-Q0222_Proposal1: Inference rule to signal horizontal and vertical position of the top left CTU of 0-th subpicture #ifndef JVET_J0090_MEMORY_BANDWITH_MEASURE #define JVET_J0090_MEMORY_BANDWITH_MEASURE 0 diff --git a/source/Lib/DecoderLib/VLCReader.cpp b/source/Lib/DecoderLib/VLCReader.cpp index 1bb882af91db4f2ad5313877858e25268abb8509..25018c4244d81e3274c75c53732366ef46b3cd89 100644 --- a/source/Lib/DecoderLib/VLCReader.cpp +++ b/source/Lib/DecoderLib/VLCReader.cpp @@ -1296,11 +1296,7 @@ void HLSyntaxReader::parseSPS(SPS* pcSPS) { for (int picIdx = 0; picIdx < pcSPS->getNumSubPics(); picIdx++) { -#if JVET_Q0222_SUBPICTURE_SIGNALLING if ((picIdx > 0) && (pcSPS->getMaxPicWidthInLumaSamples() > pcSPS->getCTUSize())) -#else - if (pcSPS->getMaxPicWidthInLumaSamples() > pcSPS->getCTUSize()) -#endif { READ_CODE(ceilLog2((pcSPS->getMaxPicWidthInLumaSamples() + pcSPS->getCTUSize() - 1) / pcSPS->getCTUSize()), uiCode, "subpic_ctu_top_left_x[ i ]"); pcSPS->setSubPicCtuTopLeftX(picIdx, uiCode); @@ -1309,11 +1305,7 @@ void HLSyntaxReader::parseSPS(SPS* pcSPS) { pcSPS->setSubPicCtuTopLeftX(picIdx, 0); } -#if JVET_Q0222_SUBPICTURE_SIGNALLING if ((picIdx > 0) && (pcSPS->getMaxPicHeightInLumaSamples() > pcSPS->getCTUSize())) -#else - if (pcSPS->getMaxPicHeightInLumaSamples() > pcSPS->getCTUSize()) -#endif { READ_CODE(ceilLog2((pcSPS->getMaxPicHeightInLumaSamples() + pcSPS->getCTUSize() - 1) / pcSPS->getCTUSize()), uiCode, "subpic_ctu_top_left_y[ i ]"); pcSPS->setSubPicCtuTopLeftY(picIdx, uiCode); diff --git a/source/Lib/EncoderLib/VLCWriter.cpp b/source/Lib/EncoderLib/VLCWriter.cpp index 7b3777b98ba3e543d58663f9b5ea7e95c49eee07..64a1cf1c39485d04697fbdd18025d8be54105cff 100644 --- a/source/Lib/EncoderLib/VLCWriter.cpp +++ b/source/Lib/EncoderLib/VLCWriter.cpp @@ -797,19 +797,11 @@ void HLSWriter::codeSPS( const SPS* pcSPS ) { for (int picIdx = 0; picIdx < pcSPS->getNumSubPics(); picIdx++) { -#if JVET_Q0222_SUBPICTURE_SIGNALLING if ((picIdx > 0) && (pcSPS->getMaxPicWidthInLumaSamples() > pcSPS->getCTUSize())) -#else - if (pcSPS->getMaxPicWidthInLumaSamples() > pcSPS->getCTUSize()) -#endif { WRITE_CODE( pcSPS->getSubPicCtuTopLeftX(picIdx), ceilLog2(( pcSPS->getMaxPicWidthInLumaSamples() + pcSPS->getCTUSize() - 1) / pcSPS->getCTUSize()), "subpic_ctu_top_left_x[ i ]" ); } -#if JVET_Q0222_SUBPICTURE_SIGNALLING if ((picIdx > 0) && (pcSPS->getMaxPicHeightInLumaSamples() > pcSPS->getCTUSize())) -#else - if (pcSPS->getMaxPicHeightInLumaSamples() > pcSPS->getCTUSize()) -#endif { WRITE_CODE( pcSPS->getSubPicCtuTopLeftY(picIdx), ceilLog2(( pcSPS->getMaxPicHeightInLumaSamples() + pcSPS->getCTUSize() - 1) / pcSPS->getCTUSize()), "subpic_ctu_top_left_y[ i ]" ); }