From 6f348057ea7439fea587b9edb6c2192d3144d54c Mon Sep 17 00:00:00 2001
From: Peter Chuang <peter.chuang@mediatek.com>
Date: Sun, 9 Feb 2020 00:58:45 +0800
Subject: [PATCH] Using static array instead of member variable for
m_layerChromaFormat and m_layerBitDepth
---
source/Lib/DecoderLib/DecLib.cpp | 22 ++++++----------------
source/Lib/DecoderLib/DecLib.h | 4 ----
2 files changed, 6 insertions(+), 20 deletions(-)
diff --git a/source/Lib/DecoderLib/DecLib.cpp b/source/Lib/DecoderLib/DecLib.cpp
index ab1088bcf..6c6ad9d2f 100644
--- a/source/Lib/DecoderLib/DecLib.cpp
+++ b/source/Lib/DecoderLib/DecLib.cpp
@@ -443,13 +443,6 @@ DecLib::DecLib()
#if ENABLE_SIMD_OPT_BUFFER
g_pelBufOP.initPelBufOpsX86();
#endif
-#if JVET_Q0172_CHROMA_FORMAT_BITDEPTH_CONSTRAINT
- for (int i = 0; i < MAX_VPS_LAYERS; i++)
- {
- m_layerChromaFormat[i] = NOT_VALID;
- m_layerBitDepth[i] = NOT_VALID;
- }
-#endif
}
DecLib::~DecLib()
@@ -1326,26 +1319,23 @@ void DecLib::xActivateParameterSets( const int layerId )
#endif
#if JVET_Q0172_CHROMA_FORMAT_BITDEPTH_CONSTRAINT
+ static std::unordered_map<int, int> m_layerChromaFormat;
+ static std::unordered_map<int, int> m_layerBitDepth;
+
if (vps != nullptr && vps->getMaxLayers() > 1)
{
int curLayerIdx = vps->getGeneralLayerIdx(layerId);
int curLayerChromaFormat = sps->getChromaFormatIdc();
int curLayerBitDepth = sps->getBitDepth(CHANNEL_TYPE_LUMA);
- if (m_layerChromaFormat[curLayerIdx] == NOT_VALID)
- {
- m_layerChromaFormat[curLayerIdx] = curLayerChromaFormat;
- }
- else
- {
- CHECK(m_layerChromaFormat[curLayerIdx] != curLayerChromaFormat, "Different chroma format in the same layer.");
- }
- if (m_layerBitDepth[curLayerIdx] == NOT_VALID)
+ if (m_layerBitDepth[curLayerIdx] == 0) //not yet register the chroma format and bitdepth to m_layerChromaFormat and m_layerBitDepth
{
+ m_layerChromaFormat[curLayerIdx] = curLayerChromaFormat;
m_layerBitDepth[curLayerIdx] = curLayerBitDepth;
}
else
{
+ CHECK(m_layerChromaFormat[curLayerIdx] != curLayerChromaFormat, "Different chroma format in the same layer.");
CHECK(m_layerBitDepth[curLayerIdx] != curLayerBitDepth, "Different bit-depth in the same layer.");
}
diff --git a/source/Lib/DecoderLib/DecLib.h b/source/Lib/DecoderLib/DecLib.h
index 4d7ed3465..a198dd7ce 100644
--- a/source/Lib/DecoderLib/DecLib.h
+++ b/source/Lib/DecoderLib/DecLib.h
@@ -146,10 +146,6 @@ private:
VPS* m_vps;
bool m_scalingListUpdateFlag;
int m_PreScalingListAPSId;
-#if JVET_Q0172_CHROMA_FORMAT_BITDEPTH_CONSTRAINT
- int m_layerChromaFormat[MAX_VPS_LAYERS];
- int m_layerBitDepth[MAX_VPS_LAYERS];
-#endif
#if JVET_O1143_SUBPIC_DECCHECK
public:
--
GitLab