diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h index 0354546c4021be45f961aba9d55d7f225f2dfcad..1601132cfc1cb164b48dbcba7e263324f7fcdc3f 100644 --- a/source/Lib/CommonLib/TypeDef.h +++ b/source/Lib/CommonLib/TypeDef.h @@ -149,7 +149,6 @@ -#define JVET_Q0480_RASTER_RECT_SLICES 1 // JVET-Q0480: Eliminate redundant slice height syntax when in raster rectangular slice mode (tile_idx_delta_present_flag == 0) #define JVET_Q0775_PH_IN_SH 1 // JVET-Q0755: Allow picture header in slice header diff --git a/source/Lib/DecoderLib/VLCReader.cpp b/source/Lib/DecoderLib/VLCReader.cpp index cd9b80c6b85d16455154ba3e944461173f70bd26..c7f3811ef3aca799baac34ba4e8d5c8cc4378cb8 100644 --- a/source/Lib/DecoderLib/VLCReader.cpp +++ b/source/Lib/DecoderLib/VLCReader.cpp @@ -560,7 +560,6 @@ void HLSyntaxReader::parsePPS( PPS* pcPPS ) READ_UVLC( uiCode, "slice_width_in_tiles_minus1[i]" ); } pcPPS->setSliceWidthInTiles ( i, uiCode + 1 ); -#if JVET_Q0480_RASTER_RECT_SLICES if( pcPPS->getTileIdxDeltaPresentFlag() || ( (tileIdx % pcPPS->getNumTileColumns()) == 0 ) ) { uiCode = 0; @@ -574,9 +573,6 @@ void HLSyntaxReader::parsePPS( PPS* pcPPS ) { pcPPS->setSliceHeightInTiles( i, pcPPS->getSliceHeightInTiles(i-1) ); } -#else - READ_UVLC( uiCode, "slice_height_in_tiles_minus1[i]" ); pcPPS->setSliceHeightInTiles( i, uiCode + 1 ); -#endif // multiple slices within a single tile special case if( pcPPS->getSliceWidthInTiles(i) == 1 && pcPPS->getSliceHeightInTiles(i) == 1 ) diff --git a/source/Lib/EncoderLib/VLCWriter.cpp b/source/Lib/EncoderLib/VLCWriter.cpp index 9e8e33c2771cbcef5fb7078a4e4b1b9329cfa55d..8867016b8153ffe834080f1f5737c199c286e461 100644 --- a/source/Lib/EncoderLib/VLCWriter.cpp +++ b/source/Lib/EncoderLib/VLCWriter.cpp @@ -349,7 +349,6 @@ void HLSWriter::codePPS( const PPS* pcPPS ) { WRITE_UVLC( pcPPS->getSliceWidthInTiles( i ) - 1, "slice_width_in_tiles_minus1[i]" ); } -#if JVET_Q0480_RASTER_RECT_SLICES if( pcPPS->getTileIdxDeltaPresentFlag() || ( (pcPPS->getSliceTileIdx( i ) % pcPPS->getNumTileColumns()) == 0 ) ) { if( pcPPS->getNumTileRows() > 1 ) @@ -357,9 +356,6 @@ void HLSWriter::codePPS( const PPS* pcPPS ) WRITE_UVLC( pcPPS->getSliceHeightInTiles( i ) - 1, "slice_height_in_tiles_minus1[i]" ); } } -#else - WRITE_UVLC( pcPPS->getSliceHeightInTiles( i ) - 1, "slice_height_in_tiles_minus1[i]" ); -#endif // multiple slices within a single tile special case if( pcPPS->getSliceWidthInTiles(i) == 1 && pcPPS->getSliceHeightInTiles(i) == 1 && pcPPS->getTileRowHeight(pcPPS->getSliceTileIdx(i) / pcPPS->getNumTileColumns()) > 1 )