From 223395a8f0883894a2ac2474817eccd1b11c36cc Mon Sep 17 00:00:00 2001
From: Karsten Suehring <karsten.suehring@hhi.fraunhofer.de>
Date: Sun, 26 Apr 2020 20:11:49 +0200
Subject: [PATCH] remove macro JVET_Q0151_Q0205_ENTRYPOINTS
---
source/App/EncoderApp/EncApp.cpp | 2 --
source/App/EncoderApp/EncAppCfg.cpp | 4 ----
source/App/EncoderApp/EncAppCfg.h | 2 --
source/Lib/CommonLib/CodingStructure.cpp | 16 ----------------
source/Lib/CommonLib/Slice.cpp | 15 ---------------
source/Lib/CommonLib/Slice.h | 19 -------------------
source/Lib/CommonLib/TypeDef.h | 1 -
source/Lib/DecoderLib/DecSlice.cpp | 11 -----------
source/Lib/DecoderLib/VLCReader.cpp | 9 ---------
source/Lib/EncoderLib/EncCfg.h | 4 ----
source/Lib/EncoderLib/EncGOP.cpp | 10 ----------
source/Lib/EncoderLib/EncLib.cpp | 5 -----
source/Lib/EncoderLib/EncSlice.cpp | 8 --------
source/Lib/EncoderLib/VLCWriter.cpp | 9 ---------
14 files changed, 115 deletions(-)
diff --git a/source/App/EncoderApp/EncApp.cpp b/source/App/EncoderApp/EncApp.cpp
index 528021c5b..12fe1d051 100644
--- a/source/App/EncoderApp/EncApp.cpp
+++ b/source/App/EncoderApp/EncApp.cpp
@@ -749,9 +749,7 @@ void EncApp::xInitLibCfg()
m_cEncLib.setCcvSEIMaxLuminanceValue (m_ccvSEIMaxLuminanceValue);
m_cEncLib.setCcvSEIAvgLuminanceValue (m_ccvSEIAvgLuminanceValue);
m_cEncLib.setEntropyCodingSyncEnabledFlag ( m_entropyCodingSyncEnabledFlag );
-#if JVET_Q0151_Q0205_ENTRYPOINTS
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 af0d431de..018222232 100644
--- a/source/App/EncoderApp/EncAppCfg.cpp
+++ b/source/App/EncoderApp/EncAppCfg.cpp
@@ -1116,9 +1116,7 @@ bool EncAppCfg::parseCfg( int argc, char* argv[] )
("Log2ParallelMergeLevel", m_log2ParallelMergeLevel, 2u, "Parallel merge estimation region")
#endif
("WaveFrontSynchro", m_entropyCodingSyncEnabledFlag, false, "0: entropy coding sync disabled; 1 entropy coding sync enabled")
-#if JVET_Q0151_Q0205_ENTRYPOINTS
("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")
@@ -1711,12 +1709,10 @@ bool EncAppCfg::parseCfg( int argc, char* argv[] )
m_outputBitDepth [CHANNEL_TYPE_CHROMA] = m_outputBitDepth [CHANNEL_TYPE_LUMA ];
}
-#if JVET_Q0151_Q0205_ENTRYPOINTS
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 6cc1f1c96..073110a2b 100644
--- a/source/App/EncoderApp/EncAppCfg.h
+++ b/source/App/EncoderApp/EncAppCfg.h
@@ -469,9 +469,7 @@ protected:
uint32_t m_numTileRows; ///< derived number of tile rows
bool m_singleSlicePerSubPicFlag;
bool m_entropyCodingSyncEnabledFlag;
-#if JVET_Q0151_Q0205_ENTRYPOINTS
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/CodingStructure.cpp b/source/Lib/CommonLib/CodingStructure.cpp
index 319c33c75..b52500e14 100644
--- a/source/Lib/CommonLib/CodingStructure.cpp
+++ b/source/Lib/CommonLib/CodingStructure.cpp
@@ -1555,11 +1555,7 @@ const CodingUnit* CodingStructure::getCURestricted( const Position &pos, const C
const CodingUnit* cu = getCU( pos, _chType );
// exists same slice and tile cu precedes curCu in encoding order
// (thus, is either from parent CS in RD-search or its index is lower)
-#if JVET_Q0151_Q0205_ENTRYPOINTS
const bool wavefrontsEnabled = curCu.slice->getSPS()->getEntropyCodingSyncEnabledFlag();
-#else
- const bool wavefrontsEnabled = curCu.slice->getPPS()->getEntropyCodingSyncEnabledFlag();
-#endif
int ctuSizeBit = floorLog2(curCu.cs->sps->getMaxCUWidth());
int xNbY = pos.x << getChannelTypeScaleX( _chType, curCu.chromaFormat );
int xCurr = curCu.blocks[_chType].x << getChannelTypeScaleX( _chType, curCu.chromaFormat );
@@ -1577,11 +1573,7 @@ const CodingUnit* CodingStructure::getCURestricted( const Position &pos, const C
const CodingUnit* CodingStructure::getCURestricted( const Position &pos, const Position curPos, const unsigned curSliceIdx, const unsigned curTileIdx, const ChannelType _chType ) const
{
const CodingUnit* cu = getCU( pos, _chType );
-#if JVET_Q0151_Q0205_ENTRYPOINTS
const bool wavefrontsEnabled = this->slice->getSPS()->getEntropyCodingSyncEnabledFlag();
-#else
- const bool wavefrontsEnabled = this->slice->getPPS()->getEntropyCodingSyncEnabledFlag();
-#endif
int ctuSizeBit = floorLog2(this->sps->getMaxCUWidth());
int xNbY = pos.x << getChannelTypeScaleX( _chType, this->area.chromaFormat );
int xCurr = curPos.x << getChannelTypeScaleX( _chType, this->area.chromaFormat );
@@ -1594,11 +1586,7 @@ const PredictionUnit* CodingStructure::getPURestricted( const Position &pos, con
const PredictionUnit* pu = getPU( pos, _chType );
// exists same slice and tile pu precedes curPu in encoding order
// (thus, is either from parent CS in RD-search or its index is lower)
-#if JVET_Q0151_Q0205_ENTRYPOINTS
const bool wavefrontsEnabled = curPu.cu->slice->getSPS()->getEntropyCodingSyncEnabledFlag();
-#else
- const bool wavefrontsEnabled = curPu.cu->slice->getPPS()->getEntropyCodingSyncEnabledFlag();
-#endif
int ctuSizeBit = floorLog2(curPu.cs->sps->getMaxCUWidth());
int xNbY = pos.x << getChannelTypeScaleX( _chType, curPu.chromaFormat );
int xCurr = curPu.blocks[_chType].x << getChannelTypeScaleX( _chType, curPu.chromaFormat );
@@ -1618,11 +1606,7 @@ const TransformUnit* CodingStructure::getTURestricted( const Position &pos, cons
const TransformUnit* tu = getTU( pos, _chType );
// exists same slice and tile tu precedes curTu in encoding order
// (thus, is either from parent CS in RD-search or its index is lower)
-#if JVET_Q0151_Q0205_ENTRYPOINTS
const bool wavefrontsEnabled = curTu.cu->slice->getSPS()->getEntropyCodingSyncEnabledFlag();
-#else
- const bool wavefrontsEnabled = curTu.cu->slice->getPPS()->getEntropyCodingSyncEnabledFlag();
-#endif
int ctuSizeBit = floorLog2(curTu.cs->sps->getMaxCUWidth());
int xNbY = pos.x << getChannelTypeScaleX( _chType, curTu.chromaFormat );
int xCurr = curTu.blocks[_chType].x << getChannelTypeScaleX( _chType, curTu.chromaFormat );
diff --git a/source/Lib/CommonLib/Slice.cpp b/source/Lib/CommonLib/Slice.cpp
index 615dfd6e4..6e4b67bf1 100644
--- a/source/Lib/CommonLib/Slice.cpp
+++ b/source/Lib/CommonLib/Slice.cpp
@@ -250,7 +250,6 @@ void Slice::inheritFromPicHeader( PicHeader *picHeader, const PPS *pps, const SP
#endif
}
-#if JVET_Q0151_Q0205_ENTRYPOINTS
void Slice::setNumSubstream(const SPS* sps, const PPS* pps)
{
uint32_t ctuAddr, ctuX, ctuY;
@@ -272,14 +271,9 @@ void Slice::setNumSubstream(const SPS* sps, const PPS* pps)
}
void Slice::setNumEntryPoints(const SPS *sps, const PPS *pps)
-#else
-void Slice::setNumEntryPoints( const PPS *pps )
-#endif
{
uint32_t ctuAddr, ctuX, ctuY;
-#if JVET_Q0151_Q0205_ENTRYPOINTS
uint32_t prevCtuAddr, prevCtuX, prevCtuY;
-#endif
m_numEntryPoints = 0;
// count the number of CTUs that align with either the start of a tile, or with an entropy coding sync point
@@ -289,15 +283,11 @@ void Slice::setNumEntryPoints( const PPS *pps )
ctuAddr = m_sliceMap.getCtuAddrInSlice( i );
ctuX = ( ctuAddr % pps->getPicWidthInCtu() );
ctuY = ( ctuAddr / pps->getPicWidthInCtu() );
-#if JVET_Q0151_Q0205_ENTRYPOINTS
prevCtuAddr = m_sliceMap.getCtuAddrInSlice(i - 1);
prevCtuX = (prevCtuAddr % pps->getPicWidthInCtu());
prevCtuY = (prevCtuAddr / pps->getPicWidthInCtu());
if (pps->ctuToTileRowBd(ctuY) != pps->ctuToTileRowBd(prevCtuY) || pps->ctuToTileColBd(ctuX) != pps->ctuToTileColBd(prevCtuX) || (ctuY != prevCtuY && sps->getEntropyCodingSyncEntryPointsPresentFlag()))
-#else
- if( pps->ctuIsTileColBd( ctuX ) && (pps->ctuIsTileRowBd( ctuY ) || pps->getEntropyCodingSyncEnabledFlag() ) )
-#endif
{
m_numEntryPoints++;
}
@@ -2422,10 +2412,8 @@ SPS::SPS()
, m_log2MaxTransformSkipBlockSize (2)
, m_BDPCMEnabledFlag (false)
, m_JointCbCrEnabledFlag (false)
-#if JVET_Q0151_Q0205_ENTRYPOINTS
, m_entropyCodingSyncEnabledFlag(false)
, m_entropyCodingSyncEntryPointPresentFlag(false)
-#endif
, m_sbtmvpEnabledFlag (false)
, m_bdofEnabledFlag (false)
, m_fpelMmvdEnabledFlag ( false )
@@ -2683,9 +2671,6 @@ PPS::PPS()
, m_tileIdxDeltaPresentFlag (0)
, m_loopFilterAcrossTilesEnabledFlag (1)
, m_loopFilterAcrossSlicesEnabledFlag(0)
-#if !JVET_Q0151_Q0205_ENTRYPOINTS
-, m_entropyCodingSyncEnabledFlag (false)
-#endif
, m_cabacInitPresentFlag (false)
, m_pictureHeaderExtensionPresentFlag(0)
, m_sliceHeaderExtensionPresentFlag (false)
diff --git a/source/Lib/CommonLib/Slice.h b/source/Lib/CommonLib/Slice.h
index 3773d57cc..df4de7177 100644
--- a/source/Lib/CommonLib/Slice.h
+++ b/source/Lib/CommonLib/Slice.h
@@ -1285,10 +1285,8 @@ private:
bool m_JointCbCrEnabledFlag;
// Parameter
BitDepths m_bitDepths;
-#if JVET_Q0151_Q0205_ENTRYPOINTS
bool m_entropyCodingSyncEnabledFlag; //!< Flag for enabling WPP
bool m_entropyCodingSyncEntryPointPresentFlag; //!< Flag for indicating the presence of WPP entry points
- #endif
int m_qpBDOffset[MAX_NUM_CHANNEL_TYPE];
int m_minQpMinus4[MAX_NUM_CHANNEL_TYPE]; // QP_internal - QP_input;
@@ -1576,12 +1574,10 @@ public:
void setBitDepth(ChannelType type, int u ) { m_bitDepths.recon[type] = u; }
const BitDepths& getBitDepths() const { return m_bitDepths; }
-#if JVET_Q0151_Q0205_ENTRYPOINTS
bool getEntropyCodingSyncEnabledFlag() const { return m_entropyCodingSyncEnabledFlag; }
void setEntropyCodingSyncEnabledFlag(bool val) { m_entropyCodingSyncEnabledFlag = val; }
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]); }
@@ -1870,9 +1866,6 @@ private:
#endif
bool m_loopFilterAcrossTilesEnabledFlag; //!< loop filtering applied across tiles flag
bool m_loopFilterAcrossSlicesEnabledFlag; //!< loop filtering applied across slices flag
-#if !JVET_Q0151_Q0205_ENTRYPOINTS
- bool m_entropyCodingSyncEnabledFlag; //!< Indicates the presence of wavefronts
-#endif
bool m_cabacInitPresentFlag;
@@ -2081,10 +2074,6 @@ public:
void initRasterSliceMap( std::vector<uint32_t> sizes );
void checkSliceMap();
SliceMap getSliceMap( int idx ) const { CHECK( idx >= m_numSlicesInPic, "Slice index exceeds valid range" ); return m_sliceMap[idx]; }
-#if !JVET_Q0151_Q0205_ENTRYPOINTS
- bool getEntropyCodingSyncEnabledFlag() const { return m_entropyCodingSyncEnabledFlag; }
- void setEntropyCodingSyncEnabledFlag(bool val) { m_entropyCodingSyncEnabledFlag = val; }
-#endif
@@ -2596,9 +2585,7 @@ private:
ClpRngs m_clpRngs;
std::vector<uint32_t> m_substreamSizes;
uint32_t m_numEntryPoints;
-#if JVET_Q0151_Q0205_ENTRYPOINTS
uint32_t m_numSubstream;
-#endif
bool m_cabacInitFlag;
@@ -2861,11 +2848,9 @@ public:
uint32_t getNumberOfSubstreamSizes( ) { return (uint32_t) m_substreamSizes.size(); }
void addSubstreamSize( uint32_t size ) { m_substreamSizes.push_back(size); }
uint32_t getSubstreamSize( uint32_t idx ) { CHECK(idx>=getNumberOfSubstreamSizes(),"Invalid index"); return m_substreamSizes[idx]; }
-#if JVET_Q0151_Q0205_ENTRYPOINTS
void resetNumberOfSubstream() { m_numSubstream = 0; }
uint32_t getNumberOfSubstream() { return (uint32_t) m_numSubstream; }
void increaseNumberOfSubstream() { m_numSubstream++; }
-#endif
void setCabacInitFlag( bool val ) { m_cabacInitFlag = val; } //!< set CABAC initial flag
bool getCabacInitFlag() const { return m_cabacInitFlag; } //!< get CABAC initial flag
@@ -2923,12 +2908,8 @@ public:
void freeScaledRefPicList( Picture *scaledRefPic[] );
bool checkRPR();
const std::pair<int, int>& getScalingRatio( const RefPicList refPicList, const int refIdx ) const { CHECK( refIdx < 0, "Invalid reference index" ); return m_scalingRatio[refPicList][refIdx]; }
-#if JVET_Q0151_Q0205_ENTRYPOINTS
void setNumSubstream( const SPS *sps, const PPS *pps );
void setNumEntryPoints( const SPS *sps, const PPS *pps );
-#else
- void setNumEntryPoints( const PPS *pps );
-#endif
uint32_t getNumEntryPoints( ) const { return m_numEntryPoints; }
#if JVET_Q0795_CCALF
diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h
index 96ee22ae6..ed7973251 100644
--- a/source/Lib/CommonLib/TypeDef.h
+++ b/source/Lib/CommonLib/TypeDef.h
@@ -138,7 +138,6 @@
-#define JVET_Q0151_Q0205_ENTRYPOINTS 1 // JVET-Q0151 & JVET-Q0205: Make mandatory the tile offsets signalling and move the entropy_coding_sync_enabled_flag entry_point_offsets_present_flag syntax elements to the SPS from the PPS
#define JVET_Q0203_MULTI_SLICE_IN_TILE 1 // JVET-Q0203: Signalling of multiple rectangular slices within a tile
diff --git a/source/Lib/DecoderLib/DecSlice.cpp b/source/Lib/DecoderLib/DecSlice.cpp
index 8e332d81e..11d8e3fe7 100644
--- a/source/Lib/DecoderLib/DecSlice.cpp
+++ b/source/Lib/DecoderLib/DecSlice.cpp
@@ -114,12 +114,8 @@ void DecSlice::decompressSlice( Slice* slice, InputBitstream* bitstream, int deb
}
const unsigned widthInCtus = cs.pcv->widthInCtus;
-#if JVET_Q0151_Q0205_ENTRYPOINTS
const bool wavefrontsEnabled = cs.sps->getEntropyCodingSyncEnabledFlag();
const bool wavefrontsEntryPointPresent = cs.sps->getEntropyCodingSyncEntryPointsPresentFlag();
-#else
- const bool wavefrontsEnabled = cs.pps->getEntropyCodingSyncEnabledFlag();
-#endif
cabacReader.initBitstream( ppcSubstreams[0] );
cabacReader.initCtxModels( *slice );
@@ -253,7 +249,6 @@ 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_Q0151_Q0205_ENTRYPOINTS
bool isLastTileCtu = (ctuXPosInCtus + 1 == tileXPosInCtus + tileColWidth) && (ctuYPosInCtus + 1 == tileYPosInCtus + tileRowHeight);
if( isLastTileCtu || wavefrontsEntryPointPresent )
{
@@ -262,12 +257,6 @@ void DecSlice::decompressSlice( Slice* slice, InputBitstream* bitstream, int deb
#endif
subStrmId++;
}
-#else
-#if DECODER_CHECK_SUBSTREAM_AND_SLICE_TRAILING_BYTES
- cabacReader.remaining_bytes( true );
-#endif
- subStrmId++;
-#endif
}
#if JVET_O1143_MV_ACROSS_SUBPIC_BOUNDARY
if (slice->getPPS()->getNumSubPics() >= 2 && curSubPic.getTreatedAsPicFlag() && ctuIdx == (slice->getNumCtuInSlice() - 1))
diff --git a/source/Lib/DecoderLib/VLCReader.cpp b/source/Lib/DecoderLib/VLCReader.cpp
index f0457351d..93b35841b 100644
--- a/source/Lib/DecoderLib/VLCReader.cpp
+++ b/source/Lib/DecoderLib/VLCReader.cpp
@@ -676,9 +676,6 @@ void HLSyntaxReader::parsePPS( PPS* pcPPS )
READ_CODE(1, uiCode, "loop_filter_across_slices_enabled_flag"); pcPPS->setLoopFilterAcrossSlicesEnabledFlag( uiCode == 1 );
}
-#if !JVET_Q0151_Q0205_ENTRYPOINTS
- READ_FLAG(uiCode, "entropy_coding_sync_enabled_flag"); pcPPS->setEntropyCodingSyncEnabledFlag(uiCode == 1);
-#endif
READ_FLAG( uiCode, "cabac_init_present_flag" ); pcPPS->setCabacInitPresentFlag( uiCode ? true : false );
READ_UVLC(uiCode, "num_ref_idx_l0_default_active_minus1");
@@ -1511,13 +1508,11 @@ void HLSyntaxReader::parseSPS(SPS* pcSPS)
pcSPS->setQpBDOffset(CHANNEL_TYPE_LUMA, (int) (6*uiCode) );
pcSPS->setQpBDOffset(CHANNEL_TYPE_CHROMA, (int) (6*uiCode) );
-#if JVET_Q0151_Q0205_ENTRYPOINTS
READ_FLAG( uiCode, "sps_entropy_coding_sync_enabled_flag" ); pcSPS->setEntropyCodingSyncEnabledFlag(uiCode == 1);
if (pcSPS->getEntropyCodingSyncEnabledFlag())
{
READ_FLAG(uiCode, "sps_wpp_entry_point_offsets_present_flag"); pcSPS->setEntropyCodingSyncEntryPointsPresentFlag(uiCode == 1);
}
-#endif
READ_FLAG( uiCode, "sps_weighted_pred_flag" ); pcSPS->setUseWP( uiCode ? true : false );
READ_FLAG( uiCode, "sps_weighted_bipred_flag" ); pcSPS->setUseWPBiPred( uiCode ? true : false );
@@ -3936,14 +3931,10 @@ void HLSyntaxReader::parseSliceHeader (Slice* pcSlice, PicHeader* picHeader, Par
std::vector<uint32_t> entryPointOffset;
-#if JVET_Q0151_Q0205_ENTRYPOINTS
pcSlice->resetNumberOfSubstream();
pcSlice->setNumSubstream(sps, pps);
pcSlice->setNumEntryPoints( sps, pps );
-#else
- pcSlice->setNumEntryPoints( pps );
-#endif
if( pcSlice->getNumEntryPoints() > 0 )
{
uint32_t offsetLenMinus1;
diff --git a/source/Lib/EncoderLib/EncCfg.h b/source/Lib/EncoderLib/EncCfg.h
index 542cf2cfe..4f35723d2 100644
--- a/source/Lib/EncoderLib/EncCfg.h
+++ b/source/Lib/EncoderLib/EncCfg.h
@@ -499,9 +499,7 @@ protected:
//====== Sub-picture and Slices ========
bool m_singleSlicePerSubPicFlag;
bool m_entropyCodingSyncEnabledFlag;
-#if JVET_Q0151_Q0205_ENTRYPOINTS
bool m_entropyCodingSyncEntryPointPresentFlag; ///< flag for the presence of entry points for WPP
-#endif
HashType m_decodedPictureHashSEIType;
@@ -1440,9 +1438,7 @@ public:
bool getSaoGreedyMergeEnc () { return m_saoGreedyMergeEnc; }
void setEntropyCodingSyncEnabledFlag(bool b) { m_entropyCodingSyncEnabledFlag = b; }
bool getEntropyCodingSyncEnabledFlag() const { return m_entropyCodingSyncEnabledFlag; }
-#if JVET_Q0151_Q0205_ENTRYPOINTS
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/EncGOP.cpp b/source/Lib/EncoderLib/EncGOP.cpp
index 102b7e8ee..41c737c9c 100644
--- a/source/Lib/EncoderLib/EncGOP.cpp
+++ b/source/Lib/EncoderLib/EncGOP.cpp
@@ -2635,11 +2635,7 @@ void EncGOP::compressGOP( int iPOCLast, int iNumPicRcvd, PicList& rcListPic,
// Allocate some coders, now the number of tiles are known.
const uint32_t numberOfCtusInFrame = pcPic->cs->pcv->sizeInCtus;
const int numSubstreamsColumns = pcSlice->getPPS()->getNumTileColumns();
-#if JVET_Q0151_Q0205_ENTRYPOINTS
const int numSubstreamRows = pcSlice->getSPS()->getEntropyCodingSyncEnabledFlag() ? pcPic->cs->pcv->heightInCtus : (pcSlice->getPPS()->getNumTileRows());
-#else
- const int numSubstreamRows = pcSlice->getPPS()->getEntropyCodingSyncEnabledFlag() ? pcPic->cs->pcv->heightInCtus : (pcSlice->getPPS()->getNumTileRows());
-#endif
const int numSubstreams = std::max<int> (numSubstreamRows * numSubstreamsColumns, (int) pcPic->cs->pps->getNumSlicesInPic());
std::vector<OutputBitstream> substreamsOut(numSubstreams);
@@ -3222,10 +3218,8 @@ void EncGOP::compressGOP( int iPOCLast, int iNumPicRcvd, PicList& rcListPic,
pcSlice->setFinalized(true);
-#if JVET_Q0151_Q0205_ENTRYPOINTS
pcSlice->resetNumberOfSubstream( );
pcSlice->setNumSubstream( pcSlice->getSPS(), pcSlice->getPPS() );
-#endif
pcSlice->clearSubstreamSizes( );
{
uint32_t numBinsCoded = 0;
@@ -3241,11 +3235,7 @@ void EncGOP::compressGOP( int iPOCLast, int iNumPicRcvd, PicList& rcListPic,
// Append substreams...
OutputBitstream *pcOut = pcBitstreamRedirect;
-#if JVET_Q0151_Q0205_ENTRYPOINTS
const int numSubstreamsToCode = pcSlice->getNumberOfSubstream() + 1;
-#else
- const int numSubstreamsToCode = pcSlice->getNumberOfSubstreamSizes()+1;
-#endif
for ( uint32_t ui = 0 ; ui < numSubstreamsToCode; ui++ )
{
diff --git a/source/Lib/EncoderLib/EncLib.cpp b/source/Lib/EncoderLib/EncLib.cpp
index 5e6a75f89..4f5643fc4 100644
--- a/source/Lib/EncoderLib/EncLib.cpp
+++ b/source/Lib/EncoderLib/EncLib.cpp
@@ -1254,10 +1254,8 @@ void EncLib::xInitSPS( SPS& sps )
sps.setMinQpPrimeTsMinus4(ChannelType(channelType), max(0, 6 * (m_bitDepth[channelType] - m_inputBitDepth[channelType])));
}
-#if JVET_Q0151_Q0205_ENTRYPOINTS
sps.setEntropyCodingSyncEnabledFlag( m_entropyCodingSyncEnabledFlag );
sps.setEntropyCodingSyncEntryPointsPresentFlag( m_entropyCodingSyncEntryPointPresentFlag );
-#endif
sps.setUseWP( m_useWeightedPred );
sps.setUseWPBiPred( m_useWeightedBiPred );
@@ -1575,9 +1573,6 @@ void EncLib::xInitPPS(PPS &pps, const SPS &sps)
pps.setSliceChromaQpFlag(m_chromaCbQpOffsetDualTree != 0 || m_chromaCrQpOffsetDualTree != 0 || m_chromaCbCrQpOffsetDualTree != 0);
}
-#if !JVET_Q0151_Q0205_ENTRYPOINTS
- pps.setEntropyCodingSyncEnabledFlag(m_entropyCodingSyncEnabledFlag);
-#endif
pps.setNoPicPartitionFlag( m_noPicPartitionFlag );
if( m_noPicPartitionFlag == false )
diff --git a/source/Lib/EncoderLib/EncSlice.cpp b/source/Lib/EncoderLib/EncSlice.cpp
index c3b0ac21e..94c763843 100644
--- a/source/Lib/EncoderLib/EncSlice.cpp
+++ b/source/Lib/EncoderLib/EncSlice.cpp
@@ -1721,14 +1721,10 @@ void EncSlice::encodeSlice ( Picture* pcPic, OutputBitstream* pcSubstreams, ui
{
Slice *const pcSlice = pcPic->slices[getSliceSegmentIdx()];
-#if JVET_Q0151_Q0205_ENTRYPOINTS
const bool wavefrontsEnabled = pcSlice->getSPS()->getEntropyCodingSyncEnabledFlag();
const bool wavefrontsEntryPointsFlag = (wavefrontsEnabled) ? pcSlice->getSPS()->getEntropyCodingSyncEntryPointsPresentFlag() : false;
uint32_t substreamSize = 0;
pcSlice->resetNumberOfSubstream();
-#else
- const bool wavefrontsEnabled = pcSlice->getPPS()->getEntropyCodingSyncEnabledFlag();
-#endif
// setup coding structure
@@ -1812,7 +1808,6 @@ void EncSlice::encodeSlice ( Picture* pcPic, OutputBitstream* pcSubstreams, ui
if (!isLastCTUsinSlice) //Byte alignment only when it is not the last substream in the slice
{
// write sub-stream size
-#if JVET_Q0151_Q0205_ENTRYPOINTS
substreamSize += (pcSubstreams[uiSubStrm].getNumberOfWrittenBits() >> 3) + pcSubstreams[uiSubStrm].countStartCodeEmulations();
pcSlice->increaseNumberOfSubstream();
if( isLastCTUinTile || (isLastCTUinWPP && wavefrontsEntryPointsFlag) )
@@ -1820,9 +1815,6 @@ void EncSlice::encodeSlice ( Picture* pcPic, OutputBitstream* pcSubstreams, ui
pcSlice->addSubstreamSize(substreamSize);
substreamSize = 0;
}
-#else
- pcSlice->addSubstreamSize((pcSubstreams[uiSubStrm].getNumberOfWrittenBits() >> 3) + pcSubstreams[uiSubStrm].countStartCodeEmulations());
-#endif
}
uiSubStrm++;
}
diff --git a/source/Lib/EncoderLib/VLCWriter.cpp b/source/Lib/EncoderLib/VLCWriter.cpp
index 33ac8d3b3..9b1c5046d 100644
--- a/source/Lib/EncoderLib/VLCWriter.cpp
+++ b/source/Lib/EncoderLib/VLCWriter.cpp
@@ -413,9 +413,6 @@ void HLSWriter::codePPS( const PPS* pcPPS )
WRITE_FLAG( pcPPS->getLoopFilterAcrossSlicesEnabledFlag(), "loop_filter_across_slices_enabled_flag");
}
-#if !JVET_Q0151_Q0205_ENTRYPOINTS
- WRITE_FLAG( pcPPS->getEntropyCodingSyncEnabledFlag() ? 1 : 0, "entropy_coding_sync_enabled_flag" );
-#endif
WRITE_FLAG( pcPPS->getCabacInitPresentFlag() ? 1 : 0, "cabac_init_present_flag" );
WRITE_UVLC( pcPPS->getNumRefIdxL0DefaultActive()-1, "num_ref_idx_l0_default_active_minus1");
WRITE_UVLC( pcPPS->getNumRefIdxL1DefaultActive()-1, "num_ref_idx_l1_default_active_minus1");
@@ -938,13 +935,11 @@ void HLSWriter::codeSPS( const SPS* pcSPS )
}
WRITE_UVLC( pcSPS->getBitDepth(CHANNEL_TYPE_LUMA) - 8, "bit_depth_minus8" );
-#if JVET_Q0151_Q0205_ENTRYPOINTS
WRITE_FLAG( pcSPS->getEntropyCodingSyncEnabledFlag() ? 1 : 0, "sps_entropy_coding_sync_enabled_flag" );
if (pcSPS->getEntropyCodingSyncEnabledFlag())
{
WRITE_FLAG( pcSPS->getEntropyCodingSyncEntryPointsPresentFlag() ? 1 : 0, "sps_wpp_entry_point_offsets_present_flag" );
}
-#endif
WRITE_FLAG( pcSPS->getUseWP() ? 1 : 0, "sps_weighted_pred_flag" ); // Use of Weighting Prediction (P_SLICE)
WRITE_FLAG( pcSPS->getUseWPBiPred() ? 1 : 0, "sps_weighted_bipred_flag" ); // Use of Weighting Bi-Prediction (B_SLICE)
@@ -2607,11 +2602,7 @@ void HLSWriter::codeProfileTierLevel ( const ProfileTierLevel* ptl, bool pro
*/
void HLSWriter::codeTilesWPPEntryPoint( Slice* pSlice )
{
-#if JVET_Q0151_Q0205_ENTRYPOINTS
pSlice->setNumEntryPoints( pSlice->getSPS(), pSlice->getPPS() );
-#else
- pSlice->setNumEntryPoints( pSlice->getPPS() );
-#endif
if( pSlice->getNumEntryPoints() == 0 )
{
return;
--
GitLab