diff --git a/source/Lib/DecoderLib/VLCReader.cpp b/source/Lib/DecoderLib/VLCReader.cpp index df40a8c9372ad0812cf79c8ba5d1c061083c36a6..57a32ecca2f6736a342e0b88bb907aed51b2f0b1 100644 --- a/source/Lib/DecoderLib/VLCReader.cpp +++ b/source/Lib/DecoderLib/VLCReader.cpp @@ -597,15 +597,15 @@ void HLSyntaxReader::parsePPS( PPS* pcPPS ) #endif #if JVET_R0188 - if( ( ( ( tileIdx / pcPPS->getNumTileColumns() ) != pcPPS->getNumTileRows() - 1 ) && - pcPPS->getTileIdxDeltaPresentFlag() ) || ( ( tileIdx % pcPPS->getNumTileColumns() ) == 0 ) ) + if( tileIdx / pcPPS->getNumTileColumns() != pcPPS->getNumTileRows() - 1 && + ( pcPPS->getTileIdxDeltaPresentFlag() || tileIdx % pcPPS->getNumTileColumns() == 0 ) ) { READ_UVLC( uiCode, "slice_height_in_tiles_minus1[i]" ); pcPPS->setSliceHeightInTiles( i, uiCode + 1 ); } else { - if( ( tileIdx % pcPPS->getNumTileColumns() ) == pcPPS->getNumTileColumns() - 1 ) + if( ( tileIdx / pcPPS->getNumTileColumns() ) == pcPPS->getNumTileRows() - 1 ) { pcPPS->setSliceHeightInTiles( i, 1 ); } diff --git a/source/Lib/EncoderLib/VLCWriter.cpp b/source/Lib/EncoderLib/VLCWriter.cpp index d827f730ee0587c223ae83c3f7cdce82242a7246..ce57bd2436c39729a00e37a5b069013dacbd303b 100644 --- a/source/Lib/EncoderLib/VLCWriter.cpp +++ b/source/Lib/EncoderLib/VLCWriter.cpp @@ -373,8 +373,8 @@ void HLSWriter::codePPS( const PPS* pcPPS ) #endif #if JVET_R0188 - if( ( ( ( pcPPS->getSliceTileIdx( i ) / pcPPS->getNumTileColumns() ) != pcPPS->getNumTileRows() - 1 ) && - pcPPS->getTileIdxDeltaPresentFlag() ) || ( ( pcPPS->getSliceTileIdx( i ) % pcPPS->getNumTileColumns() ) == 0 ) ) + if( pcPPS->getSliceTileIdx( i ) / pcPPS->getNumTileColumns() != pcPPS->getNumTileRows() - 1 && + ( pcPPS->getTileIdxDeltaPresentFlag() || pcPPS->getSliceTileIdx( i ) % pcPPS->getNumTileColumns() == 0 ) ) { WRITE_UVLC( pcPPS->getSliceHeightInTiles( i ) - 1, "slice_height_in_tiles_minus1[i]" ); }