From ca35e8d36590167248f28d46e4ef45f32322657f Mon Sep 17 00:00:00 2001
From: Karsten Suehring <karsten.suehring@hhi.fraunhofer.de>
Date: Mon, 6 Jul 2020 15:13:14 +0200
Subject: [PATCH] remove macro JVET_R0165_OPTIONAL_ENTRY_POINT
---
source/App/EncoderApp/EncApp.cpp | 4 ----
source/App/EncoderApp/EncAppCfg.cpp | 10 ----------
source/App/EncoderApp/EncAppCfg.h | 4 ----
source/Lib/CommonLib/Slice.cpp | 10 ----------
source/Lib/CommonLib/Slice.h | 9 ---------
source/Lib/CommonLib/TypeDef.h | 1 -
source/Lib/DecoderLib/DecSlice.cpp | 9 ---------
source/Lib/DecoderLib/VLCReader.cpp | 7 -------
source/Lib/EncoderLib/EncCfg.h | 8 --------
source/Lib/EncoderLib/EncLib.cpp | 4 ----
source/Lib/EncoderLib/EncSlice.cpp | 8 --------
source/Lib/EncoderLib/VLCWriter.cpp | 7 -------
12 files changed, 81 deletions(-)
diff --git a/source/App/EncoderApp/EncApp.cpp b/source/App/EncoderApp/EncApp.cpp
index 25c6cbc37e..f3f2560f12 100644
--- a/source/App/EncoderApp/EncApp.cpp
+++ b/source/App/EncoderApp/EncApp.cpp
@@ -768,11 +768,7 @@ void EncApp::xInitLibCfg()
m_cEncLib.setCcvSEIMaxLuminanceValue (m_ccvSEIMaxLuminanceValue);
m_cEncLib.setCcvSEIAvgLuminanceValue (m_ccvSEIAvgLuminanceValue);
m_cEncLib.setEntropyCodingSyncEnabledFlag ( m_entropyCodingSyncEnabledFlag );
-#if JVET_R0165_OPTIONAL_ENTRY_POINT
m_cEncLib.setEntryPointPresentFlag ( m_entryPointPresentFlag );
-#else
- m_cEncLib.setEntropyCodingSyncEntryPointPresentFlag ( m_entropyCodingSyncEntryPointPresentFlag );
-#endif
m_cEncLib.setTMVPModeId ( m_TMVPModeId );
m_cEncLib.setSliceLevelRpl ( m_sliceLevelRpl );
m_cEncLib.setSliceLevelDblk ( m_sliceLevelDblk );
diff --git a/source/App/EncoderApp/EncAppCfg.cpp b/source/App/EncoderApp/EncAppCfg.cpp
index 6f4d5e3858..f2f077f563 100644
--- a/source/App/EncoderApp/EncAppCfg.cpp
+++ b/source/App/EncoderApp/EncAppCfg.cpp
@@ -1155,11 +1155,7 @@ bool EncAppCfg::parseCfg( int argc, char* argv[] )
("WeightedPredMethod,-wpM", tmpWeightedPredictionMethod, int(WP_PER_PICTURE_WITH_SIMPLE_DC_COMBINED_COMPONENT), "Weighted prediction method")
("Log2ParallelMergeLevel", m_log2ParallelMergeLevel, 2u, "Parallel merge estimation region")
("WaveFrontSynchro", m_entropyCodingSyncEnabledFlag, false, "0: entropy coding sync disabled; 1 entropy coding sync enabled")
-#if JVET_R0165_OPTIONAL_ENTRY_POINT
("EntryPointsPresent", m_entryPointPresentFlag, true, "0: entry points is not present; 1 entry points may be present in slice header")
-#else
- ("WaveFrontEntryPointsPresent", m_entropyCodingSyncEntryPointPresentFlag, false, "0: entry points for WPP is not present; 1 entry points for WPP may be present in slice header")
-#endif
("ScalingList", m_useScalingListId, SCALING_LIST_OFF, "0/off: no scaling list, 1/default: default scaling lists, 2/file: scaling lists specified in ScalingListFile")
("ScalingListFile", m_scalingListFileName, string(""), "Scaling list file name. Use an empty string to produce help.")
("DisableScalingMatrixForLFNST", m_disableScalingMatrixForLfnstBlks, true, "Disable scaling matrices, when enabled, for LFNST-coded blocks")
@@ -1785,12 +1781,6 @@ bool EncAppCfg::parseCfg( int argc, char* argv[] )
m_outputBitDepth [CHANNEL_TYPE_CHROMA] = m_outputBitDepth [CHANNEL_TYPE_LUMA ];
}
-#if !JVET_R0165_OPTIONAL_ENTRY_POINT
- if( !m_entropyCodingSyncEnabledFlag )
- {
- m_entropyCodingSyncEntryPointPresentFlag = false;
- }
-#endif
m_InputChromaFormatIDC = numberToChromaFormat(tmpInputChromaFormat);
m_chromaFormatIDC = ((tmpChromaFormat == 0) ? (m_InputChromaFormatIDC) : (numberToChromaFormat(tmpChromaFormat)));
diff --git a/source/App/EncoderApp/EncAppCfg.h b/source/App/EncoderApp/EncAppCfg.h
index ef4f7113d8..59c6f5c5e4 100644
--- a/source/App/EncoderApp/EncAppCfg.h
+++ b/source/App/EncoderApp/EncAppCfg.h
@@ -480,11 +480,7 @@ protected:
uint32_t m_numTileRows; ///< derived number of tile rows
bool m_singleSlicePerSubPicFlag;
bool m_entropyCodingSyncEnabledFlag;
-#if JVET_R0165_OPTIONAL_ENTRY_POINT
bool m_entryPointPresentFlag; ///< flag for the presence of entry points
-#else
- bool m_entropyCodingSyncEntryPointPresentFlag; ///< flag for the presence of entry points for WPP
-#endif
bool m_bFastUDIUseMPMEnabled;
bool m_bFastMEForGenBLowDelayEnabled;
diff --git a/source/Lib/CommonLib/Slice.cpp b/source/Lib/CommonLib/Slice.cpp
index 3ef681352f..1c2123f8d0 100644
--- a/source/Lib/CommonLib/Slice.cpp
+++ b/source/Lib/CommonLib/Slice.cpp
@@ -286,12 +286,10 @@ void Slice::setNumEntryPoints(const SPS *sps, const PPS *pps)
uint32_t prevCtuAddr, prevCtuX, prevCtuY;
m_numEntryPoints = 0;
-#if JVET_R0165_OPTIONAL_ENTRY_POINT
if (!sps->getEntryPointsPresentFlag())
{
return;
}
-#endif
// count the number of CTUs that align with either the start of a tile, or with an entropy coding sync point
// ignore the first CTU since it doesn't count as an entry point
@@ -304,11 +302,7 @@ void Slice::setNumEntryPoints(const SPS *sps, const PPS *pps)
prevCtuX = (prevCtuAddr % pps->getPicWidthInCtu());
prevCtuY = (prevCtuAddr / pps->getPicWidthInCtu());
-#if JVET_R0165_OPTIONAL_ENTRY_POINT
if (pps->ctuToTileRowBd(ctuY) != pps->ctuToTileRowBd(prevCtuY) || pps->ctuToTileColBd(ctuX) != pps->ctuToTileColBd(prevCtuX) || (ctuY != prevCtuY && sps->getEntropyCodingSyncEnabledFlag()))
-#else
- if (pps->ctuToTileRowBd(ctuY) != pps->ctuToTileRowBd(prevCtuY) || pps->ctuToTileColBd(ctuX) != pps->ctuToTileColBd(prevCtuX) || (ctuY != prevCtuY && sps->getEntropyCodingSyncEntryPointsPresentFlag()))
-#endif
{
m_numEntryPoints++;
}
@@ -2772,11 +2766,7 @@ SPS::SPS()
, m_BDPCMEnabledFlag (false)
, m_JointCbCrEnabledFlag (false)
, m_entropyCodingSyncEnabledFlag(false)
-#if JVET_R0165_OPTIONAL_ENTRY_POINT
, m_entryPointPresentFlag(false)
-#else
-, m_entropyCodingSyncEntryPointPresentFlag(false)
-#endif
, m_internalMinusInputBitDepth{ 0, 0 }
, m_sbtmvpEnabledFlag (false)
, m_bdofEnabledFlag (false)
diff --git a/source/Lib/CommonLib/Slice.h b/source/Lib/CommonLib/Slice.h
index 755f2796a7..971ad9fa3a 100644
--- a/source/Lib/CommonLib/Slice.h
+++ b/source/Lib/CommonLib/Slice.h
@@ -1385,11 +1385,7 @@ private:
// Parameter
BitDepths m_bitDepths;
bool m_entropyCodingSyncEnabledFlag; //!< Flag for enabling WPP
-#if JVET_R0165_OPTIONAL_ENTRY_POINT
bool m_entryPointPresentFlag; //!< Flag for indicating the presence of entry points
-#else
- bool m_entropyCodingSyncEntryPointPresentFlag; //!< Flag for indicating the presence of WPP entry points
-#endif
int m_qpBDOffset[MAX_NUM_CHANNEL_TYPE];
#if JVET_R0045_TS_MIN_QP_CLEANUP
int m_internalMinusInputBitDepth[MAX_NUM_CHANNEL_TYPE]; // max(0, internal bitdepth - input bitdepth); }
@@ -1684,13 +1680,8 @@ public:
bool getEntropyCodingSyncEnabledFlag() const { return m_entropyCodingSyncEnabledFlag; }
void setEntropyCodingSyncEnabledFlag(bool val) { m_entropyCodingSyncEnabledFlag = val; }
-#if JVET_R0165_OPTIONAL_ENTRY_POINT
bool getEntryPointsPresentFlag() const { return m_entryPointPresentFlag; }
void setEntryPointsPresentFlag(bool val) { m_entryPointPresentFlag = val; }
-#else
- bool getEntropyCodingSyncEntryPointsPresentFlag() const { return m_entropyCodingSyncEntryPointPresentFlag; }
- void setEntropyCodingSyncEntryPointsPresentFlag(bool val) { m_entropyCodingSyncEntryPointPresentFlag = val; }
-#endif
int getMaxLog2TrDynamicRange(ChannelType channelType) const { return getSpsRangeExtension().getExtendedPrecisionProcessingFlag() ? std::max<int>(15, int(m_bitDepths.recon[channelType] + 6)) : 15; }
int getDifferentialLumaChromaBitDepth() const { return int(m_bitDepths.recon[CHANNEL_TYPE_LUMA]) - int(m_bitDepths.recon[CHANNEL_TYPE_CHROMA]); }
diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h
index b214be59e7..8d181387a5 100644
--- a/source/Lib/CommonLib/TypeDef.h
+++ b/source/Lib/CommonLib/TypeDef.h
@@ -89,7 +89,6 @@
-#define JVET_R0165_OPTIONAL_ENTRY_POINT 1 // JVET-R0165: Optional entry point offset
#define JVET_R0166_SCALING_LISTS_CHROMA_444 1 // JVET-R0166: Scaling list for Chroma 444
diff --git a/source/Lib/DecoderLib/DecSlice.cpp b/source/Lib/DecoderLib/DecSlice.cpp
index 3a19443561..f70fb73f55 100644
--- a/source/Lib/DecoderLib/DecSlice.cpp
+++ b/source/Lib/DecoderLib/DecSlice.cpp
@@ -115,11 +115,7 @@ void DecSlice::decompressSlice( Slice* slice, InputBitstream* bitstream, int deb
const unsigned widthInCtus = cs.pcv->widthInCtus;
const bool wavefrontsEnabled = cs.sps->getEntropyCodingSyncEnabledFlag();
-#if JVET_R0165_OPTIONAL_ENTRY_POINT
const bool entryPointPresent = cs.sps->getEntryPointsPresentFlag();
-#else
- const bool wavefrontsEntryPointPresent = cs.sps->getEntropyCodingSyncEntryPointsPresentFlag();
-#endif
cabacReader.initBitstream( ppcSubstreams[0] );
cabacReader.initCtxModels( *slice );
@@ -259,12 +255,7 @@ void DecSlice::decompressSlice( Slice* slice, InputBitstream* bitstream, int deb
// (end of slice-segment, end of tile, end of wavefront-CTU-row)
unsigned binVal = cabacReader.terminating_bit();
CHECK( !binVal, "Expecting a terminating bit" );
-#if JVET_R0165_OPTIONAL_ENTRY_POINT
if( entryPointPresent )
-#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 );
diff --git a/source/Lib/DecoderLib/VLCReader.cpp b/source/Lib/DecoderLib/VLCReader.cpp
index ae94064620..c97196fb4e 100644
--- a/source/Lib/DecoderLib/VLCReader.cpp
+++ b/source/Lib/DecoderLib/VLCReader.cpp
@@ -1552,14 +1552,7 @@ void HLSyntaxReader::parseSPS(SPS* pcSPS)
pcSPS->setQpBDOffset(CHANNEL_TYPE_CHROMA, (int) (6*uiCode) );
READ_FLAG( uiCode, "sps_entropy_coding_sync_enabled_flag" ); pcSPS->setEntropyCodingSyncEnabledFlag(uiCode == 1);
-#if JVET_R0165_OPTIONAL_ENTRY_POINT
READ_FLAG(uiCode, "sps_entry_point_offsets_present_flag"); pcSPS->setEntryPointsPresentFlag(uiCode == 1);
-#else
- if (pcSPS->getEntropyCodingSyncEnabledFlag())
- {
- READ_FLAG(uiCode, "sps_wpp_entry_point_offsets_present_flag"); pcSPS->setEntropyCodingSyncEntryPointsPresentFlag(uiCode == 1);
- }
-#endif
READ_CODE(4, uiCode, "log2_max_pic_order_cnt_lsb_minus4"); pcSPS->setBitsForPOC( 4 + uiCode );
CHECK(uiCode > 12, "log2_max_pic_order_cnt_lsb_minus4 shall be in the range of 0 to 12");
diff --git a/source/Lib/EncoderLib/EncCfg.h b/source/Lib/EncoderLib/EncCfg.h
index c6a0aab3ca..f6f331f398 100644
--- a/source/Lib/EncoderLib/EncCfg.h
+++ b/source/Lib/EncoderLib/EncCfg.h
@@ -514,11 +514,7 @@ protected:
//====== Sub-picture and Slices ========
bool m_singleSlicePerSubPicFlag;
bool m_entropyCodingSyncEnabledFlag;
-#if JVET_R0165_OPTIONAL_ENTRY_POINT
bool m_entryPointPresentFlag; ///< flag for the presence of entry points
-#else
- bool m_entropyCodingSyncEntryPointPresentFlag; ///< flag for the presence of entry points for WPP
-#endif
HashType m_decodedPictureHashSEIType;
bool m_bufferingPeriodSEIEnabled;
@@ -1479,11 +1475,7 @@ public:
bool getSaoGreedyMergeEnc () { return m_saoGreedyMergeEnc; }
void setEntropyCodingSyncEnabledFlag(bool b) { m_entropyCodingSyncEnabledFlag = b; }
bool getEntropyCodingSyncEnabledFlag() const { return m_entropyCodingSyncEnabledFlag; }
-#if JVET_R0165_OPTIONAL_ENTRY_POINT
void setEntryPointPresentFlag(bool b) { m_entryPointPresentFlag = b; }
-#else
- void setEntropyCodingSyncEntryPointPresentFlag(bool b) { m_entropyCodingSyncEntryPointPresentFlag = b; }
-#endif
void setDecodedPictureHashSEIType(HashType m) { m_decodedPictureHashSEIType = m; }
HashType getDecodedPictureHashSEIType() const { return m_decodedPictureHashSEIType; }
void setBufferingPeriodSEIEnabled(bool b) { m_bufferingPeriodSEIEnabled = b; }
diff --git a/source/Lib/EncoderLib/EncLib.cpp b/source/Lib/EncoderLib/EncLib.cpp
index ac0f6d28f5..90c2b84c7a 100644
--- a/source/Lib/EncoderLib/EncLib.cpp
+++ b/source/Lib/EncoderLib/EncLib.cpp
@@ -1285,11 +1285,7 @@ void EncLib::xInitSPS( SPS& sps )
}
sps.setEntropyCodingSyncEnabledFlag( m_entropyCodingSyncEnabledFlag );
-#if JVET_R0165_OPTIONAL_ENTRY_POINT
sps.setEntryPointsPresentFlag( m_entryPointPresentFlag );
-#else
- sps.setEntropyCodingSyncEntryPointsPresentFlag( m_entropyCodingSyncEntryPointPresentFlag );
-#endif
sps.setUseWP( m_useWeightedPred );
sps.setUseWPBiPred( m_useWeightedBiPred );
diff --git a/source/Lib/EncoderLib/EncSlice.cpp b/source/Lib/EncoderLib/EncSlice.cpp
index b08404d69b..56fde033a8 100644
--- a/source/Lib/EncoderLib/EncSlice.cpp
+++ b/source/Lib/EncoderLib/EncSlice.cpp
@@ -1817,11 +1817,7 @@ void EncSlice::encodeSlice ( Picture* pcPic, OutputBitstream* pcSubstreams, ui
Slice *const pcSlice = pcPic->slices[getSliceSegmentIdx()];
const bool wavefrontsEnabled = pcSlice->getSPS()->getEntropyCodingSyncEnabledFlag();
-#if JVET_R0165_OPTIONAL_ENTRY_POINT
const bool entryPointsPresentFlag = pcSlice->getSPS()->getEntryPointsPresentFlag();
-#else
- const bool wavefrontsEntryPointsFlag = (wavefrontsEnabled) ? pcSlice->getSPS()->getEntropyCodingSyncEntryPointsPresentFlag() : false;
-#endif
uint32_t substreamSize = 0;
pcSlice->resetNumberOfSubstream();
@@ -1911,11 +1907,7 @@ void EncSlice::encodeSlice ( Picture* pcPic, OutputBitstream* pcSubstreams, ui
// write sub-stream size
substreamSize += (pcSubstreams[uiSubStrm].getNumberOfWrittenBits() >> 3) + pcSubstreams[uiSubStrm].countStartCodeEmulations();
pcSlice->increaseNumberOfSubstream();
-#if JVET_R0165_OPTIONAL_ENTRY_POINT
if( entryPointsPresentFlag )
-#else
- if( isLastCTUinTile || (isLastCTUinWPP && wavefrontsEntryPointsFlag) )
-#endif
{
pcSlice->addSubstreamSize(substreamSize);
substreamSize = 0;
diff --git a/source/Lib/EncoderLib/VLCWriter.cpp b/source/Lib/EncoderLib/VLCWriter.cpp
index 0d6ff4ce83..67ff0b5175 100644
--- a/source/Lib/EncoderLib/VLCWriter.cpp
+++ b/source/Lib/EncoderLib/VLCWriter.cpp
@@ -931,14 +931,7 @@ void HLSWriter::codeSPS( const SPS* pcSPS )
WRITE_UVLC( pcSPS->getBitDepth(CHANNEL_TYPE_LUMA) - 8, "bit_depth_minus8" );
WRITE_FLAG( pcSPS->getEntropyCodingSyncEnabledFlag() ? 1 : 0, "sps_entropy_coding_sync_enabled_flag" );
-#if JVET_R0165_OPTIONAL_ENTRY_POINT
WRITE_FLAG( pcSPS->getEntryPointsPresentFlag() ? 1 : 0, "sps_entry_point_offsets_present_flag" );
-#else
- if (pcSPS->getEntropyCodingSyncEnabledFlag())
- {
- WRITE_FLAG( pcSPS->getEntropyCodingSyncEntryPointsPresentFlag() ? 1 : 0, "sps_wpp_entry_point_offsets_present_flag" );
- }
-#endif
WRITE_CODE(pcSPS->getBitsForPOC()-4, 4, "log2_max_pic_order_cnt_lsb_minus4");
WRITE_FLAG(pcSPS->getPocMsbFlag() ? 1 : 0, "sps_poc_msb_flag");
--
GitLab