From 3aba31353289d623d5da781ba5cf690b25681e58 Mon Sep 17 00:00:00 2001
From: AbeKiyo <abe.kiyo@jp.panasonic.com>
Date: Fri, 8 May 2020 14:32:16 +0900
Subject: [PATCH] JVET-R0165: Optional entry point offsets.
---
source/Lib/DecoderLib/DecSlice.cpp | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/source/Lib/DecoderLib/DecSlice.cpp b/source/Lib/DecoderLib/DecSlice.cpp
index d15d90bf2..eb7926794 100644
--- a/source/Lib/DecoderLib/DecSlice.cpp
+++ b/source/Lib/DecoderLib/DecSlice.cpp
@@ -252,23 +252,17 @@ void DecSlice::decompressSlice( Slice* slice, InputBitstream* bitstream, int deb
unsigned binVal = cabacReader.terminating_bit();
CHECK( !binVal, "Expecting a terminating bit" );
#if JVET_R0165_OPTIONAL_ENTRY_POINT
-#if DECODER_CHECK_SUBSTREAM_AND_SLICE_TRAILING_BYTES
- cabacReader.remaining_bytes( true );
-#endif
if( entryPointPresent )
- {
- subStrmId++;
- }
#else
bool isLastTileCtu = (ctuXPosInCtus + 1 == tileXPosInCtus + tileColWidth) && (ctuYPosInCtus + 1 == tileYPosInCtus + tileRowHeight);
if( isLastTileCtu || wavefrontsEntryPointPresent )
+#endif
{
#if DECODER_CHECK_SUBSTREAM_AND_SLICE_TRAILING_BYTES
cabacReader.remaining_bytes( true );
#endif
subStrmId++;
}
-#endif
}
if (slice->getPPS()->getNumSubPics() >= 2 && curSubPic.getTreatedAsPicFlag() && ctuIdx == (slice->getNumCtuInSlice() - 1))
// for last Ctu in the slice
--
GitLab