diff --git a/source/Lib/CommonLib/DepQuant.cpp b/source/Lib/CommonLib/DepQuant.cpp
index 2b06d18300f5311af8df1dfd85a77cab25cdd0cc..0cec835a1c69e90f74ffffc53d5143e813232b4b 100644
--- a/source/Lib/CommonLib/DepQuant.cpp
+++ b/source/Lib/CommonLib/DepQuant.cpp
@@ -1586,11 +1586,7 @@ void DepQuant::quant( TransformUnit &tu, const ComponentID &compID, const CCoeff
CHECK(scalingListType >= SCALING_LIST_NUM, "Invalid scaling list");
const uint32_t log2TrWidth = floorLog2(width);
const uint32_t log2TrHeight = floorLog2(height);
-#if JVET_Q0346_SCALING_LIST_USED_IN_SH
const bool disableSMForLFNST = tu.cs->slice->getExplicitScalingListUsed() ? tu.cs->picHeader->getScalingListAPS()->getScalingList().getDisableScalingMatrixForLfnstBlks() : false;
-#else
- const bool disableSMForLFNST = tu.cs->picHeader->getScalingListPresentFlag() ? tu.cs->picHeader->getScalingListAPS()->getScalingList().getDisableScalingMatrixForLfnstBlks() : false;
-#endif
const bool isLfnstApplied = tu.cu->lfnstIdx > 0 && (tu.cu->isSepTree() ? true : isLuma(compID));
const bool enableScalingLists = getUseScalingList(width, height, (tu.mtsIdx[compID] == MTS_SKIP), isLfnstApplied, disableSMForLFNST);
static_cast<DQIntern::DepQuant*>(p)->quant( tu, pSrc, compID, cQP, Quant::m_dLambda, ctx, uiAbsSum, enableScalingLists, Quant::getQuantCoeff(scalingListType, qpRem, log2TrWidth, log2TrHeight) );
@@ -1615,11 +1611,7 @@ void DepQuant::dequant( const TransformUnit &tu, CoeffBuf &dstCoeff, const Compo
CHECK(scalingListType >= SCALING_LIST_NUM, "Invalid scaling list");
const uint32_t log2TrWidth = floorLog2(width);
const uint32_t log2TrHeight = floorLog2(height);
-#if JVET_Q0346_SCALING_LIST_USED_IN_SH
const bool disableSMForLFNST = tu.cs->slice->getExplicitScalingListUsed() ? tu.cs->picHeader->getScalingListAPS()->getScalingList().getDisableScalingMatrixForLfnstBlks() : false;
-#else
- const bool disableSMForLFNST = tu.cs->picHeader->getScalingListPresentFlag() ? tu.cs->picHeader->getScalingListAPS()->getScalingList().getDisableScalingMatrixForLfnstBlks() : false;
-#endif
const bool isLfnstApplied = tu.cu->lfnstIdx > 0 && (tu.cu->isSepTree() ? true : isLuma(compID));
const bool enableScalingLists = getUseScalingList(width, height, (tu.mtsIdx[compID] == MTS_SKIP), isLfnstApplied, disableSMForLFNST);
static_cast<DQIntern::DepQuant*>(p)->dequant( tu, dstCoeff, compID, cQP, enableScalingLists, Quant::getDequantCoeff(scalingListType, qpRem, log2TrWidth, log2TrHeight) );
diff --git a/source/Lib/CommonLib/Quant.cpp b/source/Lib/CommonLib/Quant.cpp
index ca3fa12db631af354f6b37e78a0bc4317255af99..cf4f78c1bc33f89880e0ce2270bb2729123b104c 100644
--- a/source/Lib/CommonLib/Quant.cpp
+++ b/source/Lib/CommonLib/Quant.cpp
@@ -369,11 +369,7 @@ void Quant::dequant(const TransformUnit &tu,
const TCoeff transformMinimum = -(1 << maxLog2TrDynamicRange);
const TCoeff transformMaximum = (1 << maxLog2TrDynamicRange) - 1;
const bool isTransformSkip = (tu.mtsIdx[compID] == MTS_SKIP);
-#if JVET_Q0346_SCALING_LIST_USED_IN_SH
const bool disableSMForLFNST = tu.cs->slice->getExplicitScalingListUsed() ? tu.cs->picHeader->getScalingListAPS()->getScalingList().getDisableScalingMatrixForLfnstBlks() : false;
-#else
- const bool disableSMForLFNST = tu.cs->picHeader->getScalingListPresentFlag() ? tu.cs->picHeader->getScalingListAPS()->getScalingList().getDisableScalingMatrixForLfnstBlks() : false;
-#endif
const bool isLfnstApplied = tu.cu->lfnstIdx > 0 && (tu.cu->isSepTree() ? true : isLuma(compID));
const bool enableScalingLists = getUseScalingList(uiWidth, uiHeight, isTransformSkip, isLfnstApplied, disableSMForLFNST);
const int scalingListType = getScalingListType(tu.cu->predMode, compID);
@@ -982,11 +978,7 @@ void Quant::quant(TransformUnit &tu, const ComponentID &compID, const CCoeffBuf
const uint32_t uiLog2TrWidth = floorLog2(uiWidth);
const uint32_t uiLog2TrHeight = floorLog2(uiHeight);
int *piQuantCoeff = getQuantCoeff(scalingListType, cQP.rem(useTransformSkip), uiLog2TrWidth, uiLog2TrHeight);
-#if JVET_Q0346_SCALING_LIST_USED_IN_SH
const bool disableSMForLFNST = tu.cs->slice->getExplicitScalingListUsed() ? tu.cs->picHeader->getScalingListAPS()->getScalingList().getDisableScalingMatrixForLfnstBlks() : false;
-#else
- const bool disableSMForLFNST = tu.cs->picHeader->getScalingListPresentFlag() ? tu.cs->picHeader->getScalingListAPS()->getScalingList().getDisableScalingMatrixForLfnstBlks() : false;
-#endif
const bool isLfnstApplied = tu.cu->lfnstIdx > 0 && (tu.cu->isSepTree() ? true : isLuma(compID));
const bool enableScalingLists = getUseScalingList(uiWidth, uiHeight, useTransformSkip, isLfnstApplied, disableSMForLFNST);
@@ -1061,11 +1053,7 @@ bool Quant::xNeedRDOQ(TransformUnit &tu, const ComponentID &compID, const CCoeff
const uint32_t uiLog2TrHeight = floorLog2(uiHeight);
int *piQuantCoeff = getQuantCoeff(scalingListType, cQP.rem(useTransformSkip), uiLog2TrWidth, uiLog2TrHeight);
-#if JVET_Q0346_SCALING_LIST_USED_IN_SH
const bool disableSMForLFNST = tu.cs->slice->getExplicitScalingListUsed() ? tu.cs->picHeader->getScalingListAPS()->getScalingList().getDisableScalingMatrixForLfnstBlks() : false;
-#else
- const bool disableSMForLFNST = tu.cs->picHeader->getScalingListPresentFlag() ? tu.cs->picHeader->getScalingListAPS()->getScalingList().getDisableScalingMatrixForLfnstBlks() : false;
-#endif
const bool isLfnstApplied = tu.cu->lfnstIdx > 0 && (tu.cu->isSepTree() ? true : isLuma(compID));
const bool enableScalingLists = getUseScalingList(uiWidth, uiHeight, (useTransformSkip != 0), isLfnstApplied, disableSMForLFNST);
@@ -1116,11 +1104,7 @@ void Quant::transformSkipQuantOneSample(TransformUnit &tu, const ComponentID &co
const int channelBitDepth = sps.getBitDepth(toChannelType(compID));
const int iTransformShift = getTransformShift(channelBitDepth, rect.size(), maxLog2TrDynamicRange);
const int scalingListType = getScalingListType(tu.cu->predMode, compID);
-#if JVET_Q0346_SCALING_LIST_USED_IN_SH
const bool disableSMForLFNST = tu.cs->slice->getExplicitScalingListUsed() ? tu.cs->picHeader->getScalingListAPS()->getScalingList().getDisableScalingMatrixForLfnstBlks() : false;
-#else
- const bool disableSMForLFNST = tu.cs->picHeader->getScalingListPresentFlag() ? tu.cs->picHeader->getScalingListAPS()->getScalingList().getDisableScalingMatrixForLfnstBlks() : false;
-#endif
const bool isLfnstApplied = tu.cu->lfnstIdx > 0 && (tu.cu->isSepTree() ? true : isLuma(compID));
const bool enableScalingLists = getUseScalingList(uiWidth, uiHeight, true, isLfnstApplied, disableSMForLFNST);
const bool useTransformSkip = (tu.mtsIdx[compID] == MTS_SKIP);
@@ -1180,11 +1164,7 @@ void Quant::invTrSkipDeQuantOneSample(TransformUnit &tu, const ComponentID &comp
const int channelBitDepth = sps.getBitDepth(toChannelType(compID));
const int iTransformShift = getTransformShift(channelBitDepth, rect.size(), maxLog2TrDynamicRange);
const int scalingListType = getScalingListType(tu.cu->predMode, compID);
-#if JVET_Q0346_SCALING_LIST_USED_IN_SH
const bool disableSMForLFNST = tu.cs->slice->getExplicitScalingListUsed() ? tu.cs->picHeader->getScalingListAPS()->getScalingList().getDisableScalingMatrixForLfnstBlks() : false;
-#else
- const bool disableSMForLFNST = tu.cs->picHeader->getScalingListPresentFlag() ? tu.cs->picHeader->getScalingListAPS()->getScalingList().getDisableScalingMatrixForLfnstBlks() : false;
-#endif
const bool isLfnstApplied = tu.cu->lfnstIdx > 0 && (tu.cu->isSepTree() ? true : isLuma(compID));
const bool enableScalingLists = getUseScalingList(uiWidth, uiHeight, true, isLfnstApplied, disableSMForLFNST);
CHECK(scalingListType >= SCALING_LIST_NUM, "Invalid scaling list");
diff --git a/source/Lib/CommonLib/QuantRDOQ.cpp b/source/Lib/CommonLib/QuantRDOQ.cpp
index f1e74798f5b4596be642117805139034fd9c6bf5..0f3ad32e650afbc2d2db808999f7f034f8035428 100644
--- a/source/Lib/CommonLib/QuantRDOQ.cpp
+++ b/source/Lib/CommonLib/QuantRDOQ.cpp
@@ -629,11 +629,7 @@ void QuantRDOQ::xRateDistOptQuant(TransformUnit &tu, const ComponentID &compID,
const bool isTransformSkip = (tu.mtsIdx[compID] == MTS_SKIP);
const double *const pdErrScale = xGetErrScaleCoeffSL(scalingListType, uiLog2BlockWidth, uiLog2BlockHeight, cQP.rem(isTransformSkip));
const int *const piQCoef = getQuantCoeff(scalingListType, cQP.rem(isTransformSkip), uiLog2BlockWidth, uiLog2BlockHeight);
-#if JVET_Q0346_SCALING_LIST_USED_IN_SH
const bool disableSMForLFNST = tu.cs->slice->getExplicitScalingListUsed() ? tu.cs->picHeader->getScalingListAPS()->getScalingList().getDisableScalingMatrixForLfnstBlks() : false;
-#else
- const bool disableSMForLFNST = tu.cs->picHeader->getScalingListPresentFlag() ? tu.cs->picHeader->getScalingListAPS()->getScalingList().getDisableScalingMatrixForLfnstBlks() : false;
-#endif
const bool isLfnstApplied = tu.cu->lfnstIdx > 0 && (tu.cu->isSepTree() ? true : isLuma(compID));
const bool enableScalingLists = getUseScalingList(uiWidth, uiHeight, isTransformSkip, isLfnstApplied, disableSMForLFNST);
const int defaultQuantisationCoefficient = g_quantScales[ needSqrtAdjustment ?1:0][cQP.rem(isTransformSkip)];
diff --git a/source/Lib/CommonLib/Slice.cpp b/source/Lib/CommonLib/Slice.cpp
index a8a24e85ca0a1dc206a68bed46084151e4e45e59..258a3e48ac8ba3d8ace3136299423ea7ca5f4c79 100644
--- a/source/Lib/CommonLib/Slice.cpp
+++ b/source/Lib/CommonLib/Slice.cpp
@@ -62,9 +62,7 @@ Slice::Slice()
, m_iSliceQp ( 0 )
, m_ChromaQpAdjEnabled ( false )
, m_lmcsEnabledFlag ( 0 )
-#if JVET_Q0346_SCALING_LIST_USED_IN_SH
, m_explicitScalingListUsed ( 0 )
-#endif
, m_deblockingFilterDisable ( false )
, m_deblockingFilterOverrideFlag ( false )
, m_deblockingFilterBetaOffsetDiv2( 0 )
@@ -166,9 +164,7 @@ void Slice::initSlice()
m_colourPlaneId = 0;
m_colRefIdx = 0;
m_lmcsEnabledFlag = 0;
-#if JVET_Q0346_SCALING_LIST_USED_IN_SH
m_explicitScalingListUsed = 0;
-#endif
initEqualRef();
m_bCheckLDC = false;
@@ -1020,9 +1016,7 @@ void Slice::copySliceInfo(Slice *pSrc, bool cpyAlmostAll)
m_nextSlice = pSrc->m_nextSlice;
m_clpRngs = pSrc->m_clpRngs;
m_lmcsEnabledFlag = pSrc->m_lmcsEnabledFlag;
-#if JVET_Q0346_SCALING_LIST_USED_IN_SH
m_explicitScalingListUsed = pSrc->m_explicitScalingListUsed;
-#endif
m_pendingRasInit = pSrc->m_pendingRasInit;
@@ -2234,11 +2228,7 @@ PicHeader::PicHeader()
, m_lmcsApsId ( -1 )
, m_lmcsAps ( nullptr )
, m_lmcsChromaResidualScaleFlag ( 0 )
-#if JVET_Q0346_SCALING_LIST_USED_IN_SH
, m_explicitScalingListEnabledFlag ( 0 )
-#else
-, m_scalingListPresentFlag ( 0 )
-#endif
, m_scalingListApsId ( -1 )
, m_scalingListAps ( nullptr )
, m_numL0Weights ( 0 )
@@ -2331,11 +2321,7 @@ void PicHeader::initPicHeader()
m_lmcsApsId = -1;
m_lmcsAps = nullptr;
m_lmcsChromaResidualScaleFlag = 0;
-#if JVET_Q0346_SCALING_LIST_USED_IN_SH
m_explicitScalingListEnabledFlag = 0;
-#else
- m_scalingListPresentFlag = 0;
-#endif
m_scalingListApsId = -1;
m_scalingListAps = nullptr;
m_numL0Weights = 0;
diff --git a/source/Lib/CommonLib/Slice.h b/source/Lib/CommonLib/Slice.h
index 924851a43de3f867612f141883b374af1e541726..6c50256f8f27457c3953ed6463fb103ec79b32e5 100644
--- a/source/Lib/CommonLib/Slice.h
+++ b/source/Lib/CommonLib/Slice.h
@@ -2295,11 +2295,7 @@ private:
int m_lmcsApsId; //!< lmcs APS ID
APS* m_lmcsAps; //!< lmcs APS
bool m_lmcsChromaResidualScaleFlag; //!< lmcs chroma residual scale flag
-#if JVET_Q0346_SCALING_LIST_USED_IN_SH
bool m_explicitScalingListEnabledFlag; //!< explicit quantization scaling list enabled
-#else
- bool m_scalingListPresentFlag; //!< quantization scaling lists present
-#endif
int m_scalingListApsId; //!< quantization scaling list APS ID
APS* m_scalingListAps; //!< quantization scaling list APS
unsigned m_minQT[3]; //!< minimum quad-tree size 0: I slice luma; 1: P/B slice; 2: I slice chroma
@@ -2458,15 +2454,9 @@ public:
APS* getScalingListAPS() const { return m_scalingListAps; }
void setScalingListAPSId( int id ) { m_scalingListApsId = id; }
int getScalingListAPSId() const { return m_scalingListApsId; }
-#if JVET_Q0346_SCALING_LIST_USED_IN_SH
void setExplicitScalingListEnabledFlag( bool b ) { m_explicitScalingListEnabledFlag = b; }
bool getExplicitScalingListEnabledFlag() { return m_explicitScalingListEnabledFlag; }
const bool getExplicitScalingListEnabledFlag() const { return m_explicitScalingListEnabledFlag; }
-#else
- void setScalingListPresentFlag( bool b ) { m_scalingListPresentFlag = b; }
- bool getScalingListPresentFlag() { return m_scalingListPresentFlag; }
- const bool getScalingListPresentFlag() const { return m_scalingListPresentFlag; }
-#endif
unsigned* getMinQTSizes() const { return (unsigned *)m_minQT; }
unsigned* getMaxMTTHierarchyDepths() const { return (unsigned *)m_maxMTTHierarchyDepth; }
@@ -2553,9 +2543,7 @@ private:
int m_iSliceQpBase;
bool m_ChromaQpAdjEnabled;
bool m_lmcsEnabledFlag;
-#if JVET_Q0346_SCALING_LIST_USED_IN_SH
bool m_explicitScalingListUsed;
-#endif
bool m_deblockingFilterDisable;
bool m_deblockingFilterOverrideFlag; //< offsets for deblocking filter inherit from PPS
int m_deblockingFilterBetaOffsetDiv2; //< beta offset for deblocking filter
@@ -2710,10 +2698,8 @@ public:
bool getLmcsEnabledFlag() { return m_lmcsEnabledFlag; }
const bool getLmcsEnabledFlag() const { return m_lmcsEnabledFlag; }
-#if JVET_Q0346_SCALING_LIST_USED_IN_SH
void setExplicitScalingListUsed(bool b) { m_explicitScalingListUsed = b; }
bool getExplicitScalingListUsed() { return m_explicitScalingListUsed; }
-#endif
int getNumRefIdx( RefPicList e ) const { return m_aiNumRefIdx[e]; }
Picture* getPic() { return m_pcPic; }
diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h
index 9fb0fc6c34ea79b6b1df08e1846440af02d55bc4..420d504bad222c57d640c0eeb148f5738c3a1f60 100644
--- a/source/Lib/CommonLib/TypeDef.h
+++ b/source/Lib/CommonLib/TypeDef.h
@@ -133,7 +133,6 @@
-#define JVET_Q0346_SCALING_LIST_USED_IN_SH 1 // JVET-Q0346 aspect 2: Scaling list used flag in SH
#define JVET_Q0267_RESET_CHROMA_QP_OFFSET 1 // JVET-Q0267: Reset chroma QP offsets at the start of each chroma QP offset group
diff --git a/source/Lib/DecoderLib/DecLib.cpp b/source/Lib/DecoderLib/DecLib.cpp
index b82f7362ef658491b4e0556e35b7dffa7e968422..2c683dc81129acc114c1db7cdfb60c75d5ae20c7 100644
--- a/source/Lib/DecoderLib/DecLib.cpp
+++ b/source/Lib/DecoderLib/DecLib.cpp
@@ -439,10 +439,6 @@ DecLib::DecLib()
, m_debugPOC( -1 )
, m_debugCTU( -1 )
, m_vps( nullptr )
-#if !JVET_Q0346_SCALING_LIST_USED_IN_SH
- , m_scalingListUpdateFlag(true)
- , m_PreScalingListAPSId(-1)
-#endif
, m_maxDecSubPicIdx(0)
, m_maxDecSliceAddrInSubPic(-1)
, m_dci(NULL)
@@ -1107,11 +1103,7 @@ void activateAPS(PicHeader* picHeader, Slice* pSlice, ParameterSetManager& param
}
picHeader->setLmcsAPS(lmcsAPS);
-#if JVET_Q0346_SCALING_LIST_USED_IN_SH
if( picHeader->getExplicitScalingListEnabledFlag() && scalingListAPS == nullptr)
-#else
- if( picHeader->getScalingListPresentFlag() && scalingListAPS == nullptr)
-#endif
{
scalingListAPS = parameterSetManager.getAPS( picHeader->getScalingListAPSId(), SCALING_LIST_APS );
CHECK( scalingListAPS == nullptr, "No SCALING LIST APS present" );
@@ -2032,7 +2024,6 @@ bool DecLib::xDecodeSlice(InputNALUnit &nalu, int &iSkipFrame, int iPOCLastDispl
Quant *quant = m_cTrQuant.getQuant();
-#if JVET_Q0346_SCALING_LIST_USED_IN_SH
if (pcSlice->getExplicitScalingListUsed())
{
APS* scalingListAPS = pcSlice->getPicHeader()->getScalingListAPS();
@@ -2040,29 +2031,6 @@ bool DecLib::xDecodeSlice(InputNALUnit &nalu, int &iSkipFrame, int iPOCLastDispl
quant->setScalingListDec(scalingList);
quant->setUseScalingList(true);
}
-#else
- if( pcSlice->getSPS()->getScalingListFlag() )
- {
- ScalingList scalingList;
- if( pcSlice->getPicHeader()->getScalingListPresentFlag() )
- {
- APS* scalingListAPS = pcSlice->getPicHeader()->getScalingListAPS();
- scalingList = scalingListAPS->getScalingList();
- }
- else
- {
- scalingList.setDefaultScalingList();
- }
- int scalingListAPSId = pcSlice->getPicHeader()->getScalingListAPSId();
- if (getScalingListUpdateFlag() || (scalingListAPSId != getPreScalingListAPSId()))
- {
- quant->setScalingListDec(scalingList);
- setScalingListUpdateFlag(false);
- setPreScalingListAPSId(scalingListAPSId);
- }
- quant->setUseScalingList( true );
- }
-#endif
else
{
quant->setUseScalingList( false );
@@ -2216,12 +2184,6 @@ void DecLib::xDecodeAPS(InputNALUnit& nalu)
aps->setTemporalId(nalu.m_temporalId);
aps->setLayerId( nalu.m_nuhLayerId );
m_parameterSetManager.checkAuApsContent( aps, m_accessUnitApsNals );
-#if !JVET_Q0346_SCALING_LIST_USED_IN_SH
- if (aps->getAPSType() == SCALING_LIST_APS)
- {
- setScalingListUpdateFlag(true);
- }
-#endif
// aps will be deleted if it was already stored (and did not changed),
// thus, storing it must be last action.
diff --git a/source/Lib/DecoderLib/DecLib.h b/source/Lib/DecoderLib/DecLib.h
index 2c4af72f0ae709231107b46ec9fb4a42b834b2e6..2a61d00add45ae69e25de70d46c812f5f608f90c 100644
--- a/source/Lib/DecoderLib/DecLib.h
+++ b/source/Lib/DecoderLib/DecLib.h
@@ -157,10 +157,6 @@ private:
// NAL unit type, layer ID, and SEI payloadType
std::vector<std::tuple<NalUnitType, int, SEI::PayloadType>> m_accessUnitSeiPayLoadTypes;
VPS* m_vps;
-#if !JVET_Q0346_SCALING_LIST_USED_IN_SH
- bool m_scalingListUpdateFlag;
- int m_PreScalingListAPSId;
-#endif
int m_maxDecSubPicIdx;
int m_maxDecSliceAddrInSubPic;
@@ -224,12 +220,6 @@ public:
{
m_cTrQuantScalingList.init(nullptr, MAX_TB_SIZEY, false, false, false, false);
}
-#if !JVET_Q0346_SCALING_LIST_USED_IN_SH
- bool getScalingListUpdateFlag() { return m_scalingListUpdateFlag; }
- void setScalingListUpdateFlag(bool b) { m_scalingListUpdateFlag = b; }
- int getPreScalingListAPSId() { return m_PreScalingListAPSId; }
- void setPreScalingListAPSId(int id) { m_PreScalingListAPSId = id; }
-#endif
protected:
void xUpdateRasInit(Slice* slice);
diff --git a/source/Lib/DecoderLib/VLCReader.cpp b/source/Lib/DecoderLib/VLCReader.cpp
index 4a8fb5908f976ef31469097143364172c62d659b..2a6b100ce2a3807f867d5e76d55f320f8a955f8a 100644
--- a/source/Lib/DecoderLib/VLCReader.cpp
+++ b/source/Lib/DecoderLib/VLCReader.cpp
@@ -1900,11 +1900,7 @@ void HLSyntaxReader::parseSPS(SPS* pcSPS)
pcSPS->setLog2ParallelMergeLevelMinus2(uiCode);
#endif
-#if JVET_Q0346_SCALING_LIST_USED_IN_SH
READ_FLAG(uiCode, "sps_explicit_scaling_list_enabled_flag"); pcSPS->setScalingListFlag(uiCode);
-#else
- READ_FLAG( uiCode, "sps_scaling_list_enabled_flag" ); pcSPS->setScalingListFlag ( uiCode );
-#endif
READ_FLAG(uiCode, "sps_dep_quant_enabled_flag"); pcSPS->setDepQuantEnabledFlag(uiCode);
if (!pcSPS->getDepQuantEnabledFlag())
{
@@ -2531,15 +2527,9 @@ void HLSyntaxReader::parsePictureHeader( PicHeader* picHeader, ParameterSetManag
// quantization scaling lists
if (sps->getScalingListFlag())
{
-#if JVET_Q0346_SCALING_LIST_USED_IN_SH
READ_FLAG(uiCode, "ph_explicit_scaling_list_enabled_flag");
picHeader->setExplicitScalingListEnabledFlag(uiCode);
if (picHeader->getExplicitScalingListEnabledFlag())
-#else
- READ_FLAG(uiCode, "ph_scaling_list_present_flag");
- picHeader->setScalingListPresentFlag(uiCode);
- if (picHeader->getScalingListPresentFlag())
-#endif
{
READ_CODE(3, uiCode, "ph_scaling_list_aps_id");
picHeader->setScalingListAPSId(uiCode);
@@ -2547,11 +2537,7 @@ void HLSyntaxReader::parsePictureHeader( PicHeader* picHeader, ParameterSetManag
}
else
{
-#if JVET_Q0346_SCALING_LIST_USED_IN_SH
picHeader->setExplicitScalingListEnabledFlag(false);
-#else
- picHeader->setScalingListPresentFlag(false);
-#endif
}
// initialize tile/slice info for no partitioning case
@@ -3962,7 +3948,6 @@ void HLSyntaxReader::parseSliceHeader (Slice* pcSlice, PicHeader* picHeader, Par
{
pcSlice->setLmcsEnabledFlag(false);
}
-#if JVET_Q0346_SCALING_LIST_USED_IN_SH
if (picHeader->getExplicitScalingListEnabledFlag())
{
READ_FLAG(uiCode, "slice_explicit_scaling_list_used_flag");
@@ -3972,7 +3957,6 @@ void HLSyntaxReader::parseSliceHeader (Slice* pcSlice, PicHeader* picHeader, Par
{
pcSlice->setExplicitScalingListUsed(false);
}
-#endif
if( pcSlice->getFirstCtuRsAddrInSlice() == 0 )
{
pcSlice->setDefaultClpRng( *sps );
diff --git a/source/Lib/EncoderLib/EncGOP.cpp b/source/Lib/EncoderLib/EncGOP.cpp
index ebfeae2d556f1918c9366da5f99ff12ce3e4ac7b..0d364e1fe58156345c53d4d3e90465c42be34703 100644
--- a/source/Lib/EncoderLib/EncGOP.cpp
+++ b/source/Lib/EncoderLib/EncGOP.cpp
@@ -2695,12 +2695,8 @@ void EncGOP::compressGOP( int iPOCLast, int iNumPicRcvd, PicList& rcListPic,
if( pcSlice->getSPS()->getScalingListFlag() && m_pcCfg->getUseScalingListId() == SCALING_LIST_FILE_READ )
{
-#if JVET_Q0346_SCALING_LIST_USED_IN_SH
picHeader->setExplicitScalingListEnabledFlag( true );
pcSlice->setExplicitScalingListUsed( true );
-#else
- picHeader->setScalingListPresentFlag( true );
-#endif
int apsId = std::min<int>( 7, m_pcEncLib->getVPS() == nullptr ? 0 : m_pcEncLib->getVPS()->getGeneralLayerIdx( m_pcEncLib->getLayerId() ) );
picHeader->setScalingListAPSId( apsId );
@@ -2836,12 +2832,8 @@ void EncGOP::compressGOP( int iPOCLast, int iNumPicRcvd, PicList& rcListPic,
if( pcSlice->getSPS()->getScalingListFlag() && m_pcCfg->getUseScalingListId() == SCALING_LIST_FILE_READ )
{
-#if JVET_Q0346_SCALING_LIST_USED_IN_SH
picHeader->setExplicitScalingListEnabledFlag(true);
pcSlice->setExplicitScalingListUsed(true);
-#else
- picHeader->setScalingListPresentFlag(true);
-#endif
int apsId = 0;
picHeader->setScalingListAPSId( apsId );
}
diff --git a/source/Lib/EncoderLib/VLCWriter.cpp b/source/Lib/EncoderLib/VLCWriter.cpp
index 12decfd3ae2b578b8892f97792a13049da139c80..fc77768b709bdc7540c7a3dd6352cdb7efeb4d77 100644
--- a/source/Lib/EncoderLib/VLCWriter.cpp
+++ b/source/Lib/EncoderLib/VLCWriter.cpp
@@ -1659,24 +1659,15 @@ void HLSWriter::codePictureHeader( PicHeader* picHeader )
// quantization scaling lists
if( sps->getScalingListFlag() )
{
-#if JVET_Q0346_SCALING_LIST_USED_IN_SH
WRITE_FLAG( picHeader->getExplicitScalingListEnabledFlag(), "ph_scaling_list_present_flag" );
if( picHeader->getExplicitScalingListEnabledFlag() )
-#else
- WRITE_FLAG( picHeader->getScalingListPresentFlag(), "ph_scaling_list_present_flag" );
- if( picHeader->getScalingListPresentFlag() )
-#endif
{
WRITE_CODE( picHeader->getScalingListAPSId(), 3, "ph_scaling_list_aps_id" );
}
}
else
{
-#if JVET_Q0346_SCALING_LIST_USED_IN_SH
picHeader->setExplicitScalingListEnabledFlag( false );
-#else
- picHeader->setScalingListPresentFlag( false );
-#endif
}
@@ -2517,12 +2508,10 @@ void HLSWriter::codeSliceHeader ( Slice* pcSlice )
WRITE_FLAG(pcSlice->getLmcsEnabledFlag(), "slice_lmcs_enabled_flag");
}
-#if JVET_Q0346_SCALING_LIST_USED_IN_SH
if (picHeader->getExplicitScalingListEnabledFlag())
{
WRITE_FLAG(pcSlice->getExplicitScalingListUsed(), "slice_explicit_scaling_list_used_flag");
}
-#endif
if(pcSlice->getPPS()->getSliceHeaderExtensionPresentFlag())
{