diff --git a/source/App/EncoderApp/EncAppCfg.cpp b/source/App/EncoderApp/EncAppCfg.cpp
index 9be42f93d52fbbe488457f77d6e062ecc611e546..a7c94c7b465c3beba39d5538f7f8db3d4a50014e 100644
--- a/source/App/EncoderApp/EncAppCfg.cpp
+++ b/source/App/EncoderApp/EncAppCfg.cpp
@@ -708,6 +708,7 @@ bool EncAppCfg::parseCfg( int argc, char* argv[] )
int warnUnknowParameter = 0;
#if JVET_M0427_INLOOP_RESHAPER
+ const int CW_NUMS = 3;
const uint32_t defaultBinCW[CW_NUMS - 1] = { 38, 28 };
const uint32_t defaultBinThr[CW_NUMS - 1] = { 2500, 4000 };
SMultiValueInput<uint32_t> cfg_BinCW (0, 64, CW_NUMS - 1, CW_NUMS - 1, defaultBinCW, sizeof(defaultBinCW) / sizeof(uint32_t));
@@ -1852,7 +1853,7 @@ bool EncAppCfg::parseCfg( int argc, char* argv[] )
m_reshapeCW.RspFps = m_iFrameRate;
m_reshapeCW.RspIntraPeriod = m_iIntraPeriod;
m_reshapeCW.RspPicSize = m_iSourceWidth*m_iSourceHeight;
- const int FpsToIpTable[MAX_FRAME_RATE + 1] = { 0, 0, 0, 0, 0, 0, 0, 0, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 112, 112, 112, 112, 112, 112, 112, 112, 112, 112, 112, 112, 112, 112, 112, 112, 128, 128, 128, 128, 128, 128, 128, 128, 128 };
+ const int FpsToIpTable[129] = { 0, 0, 0, 0, 0, 0, 0, 0, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 112, 112, 112, 112, 112, 112, 112, 112, 112, 112, 112, 112, 112, 112, 112, 112, 128, 128, 128, 128, 128, 128, 128, 128, 128 };
m_reshapeCW.RspFpsToIp = FpsToIpTable[m_iFrameRate];
m_reshapeCW.RspBaseQP = m_iQP;
#endif
@@ -2243,7 +2244,7 @@ bool EncAppCfg::xCheckParameter()
if (m_bLumaReshapeEnable && (m_internalBitDepth[CHANNEL_TYPE_LUMA] != 10))
{
m_bLumaReshapeEnable = false;
- msg(WARNING, "Reshaping is implemented for 10bit luma internal bitdepth.\n");
+ msg(WARNING, "Reshaping is turned off for luma internal bitdepth not equal to 10.\n");
}
if (!m_bLumaReshapeEnable)
{
diff --git a/source/Lib/CommonLib/Buffer.cpp b/source/Lib/CommonLib/Buffer.cpp
index 1fcae69fde8302205dd1bb6fca10e4bb434f8e08..a5c7197e8966d0558b5acfa5103c7d06e593386d 100644
--- a/source/Lib/CommonLib/Buffer.cpp
+++ b/source/Lib/CommonLib/Buffer.cpp
@@ -368,11 +368,12 @@ void AreaBuf<Pel>::rspSignal(std::vector<Pel>& pLUT)
}
template<>
-void AreaBuf<Pel>::scaleSignal(const int scale, const bool dir)
+void AreaBuf<Pel>::scaleSignal(const int scale, const bool dir, const ClpRng& clpRng)
{
Pel* dst = buf;
Pel* src = buf;
int sign, absval;
+ int maxAbsclipBD = (1<<clpRng.bd) - 1;
if (dir) // forward
{
@@ -388,8 +389,7 @@ void AreaBuf<Pel>::scaleSignal(const int scale, const bool dir)
{
sign = src[x] >= 0 ? 1 : -1;
absval = sign * src[x];
- dst[x] = sign * (((absval << CSCALE_FP_PREC) + (scale >> 1)) / scale);
- dst[x] = dst[x] > 1023 ? 1023 : dst[x] < -1023 ? -1023 : dst[x];
+ dst[x] = (Pel)Clip3(-maxAbsclipBD, maxAbsclipBD, sign * (((absval << CSCALE_FP_PREC) + (scale >> 1)) / scale));
}
dst += stride;
src += stride;
diff --git a/source/Lib/CommonLib/Buffer.h b/source/Lib/CommonLib/Buffer.h
index 6347c675c8b45d26074781dadbda10ffe265c938..e80b015059c292db541c232746837caa33656641 100644
--- a/source/Lib/CommonLib/Buffer.h
+++ b/source/Lib/CommonLib/Buffer.h
@@ -134,7 +134,7 @@ struct AreaBuf : public Size
#if JVET_M0427_INLOOP_RESHAPER
void rspSignal ( std::vector<Pel>& pLUT );
- void scaleSignal ( const int scale, const bool dir );
+ void scaleSignal ( const int scale, const bool dir , const ClpRng& clpRng);
T computeAvg ( ) const;
#endif
T& at( const int &x, const int &y ) { return buf[y * stride + x]; }
diff --git a/source/Lib/CommonLib/CommonDef.h b/source/Lib/CommonLib/CommonDef.h
index 6333d0718cdad13025b135ad664cf6df877a9abe..eb8266718412131b1a87785edeb391f888c53465 100644
--- a/source/Lib/CommonLib/CommonDef.h
+++ b/source/Lib/CommonLib/CommonDef.h
@@ -405,17 +405,10 @@ static const int IBC_FAST_METHOD_NOINTRA_IBCCBF0 = 0x01;
static const int IBC_FAST_METHOD_BUFFERBV = 0X02;
static const int IBC_FAST_METHOD_ADAPTIVE_SEARCHRANGE = 0X04;
#if JVET_M0427_INLOOP_RESHAPER
-static const int MAX_LUMA_RESHAPING_LUT_SIZE = 1024;
-static const int CSCALE_FP_PREC = 11;
static const int PIC_ANALYZE_CW_BINS = 32;
-static const int FP_PREC = 14;
-static const int log2_MAX_LUMA_RESHAPING_LUT_SIZE = 10;
-static const int log2_PIC_ANALYZE_CW_BINS = 5;
-static const int PIC_ANALYZE_WIN_SIZE = 5;
-static const int CW_NUMS = 3;
-static const int MAX_FRAME_RATE = 128;
static const int PIC_CODE_CW_BINS = 16;
-static const int log2_PIC_CODE_CW_BINS = 4;
+static const int FP_PREC = 14;
+static const int CSCALE_FP_PREC = 11;
#endif
#if JVET_M0512_MOTION_BUFFER_COMPRESSION
static constexpr int MV_EXPONENT_BITCOUNT = 4;
diff --git a/source/Lib/CommonLib/RdCost.cpp b/source/Lib/CommonLib/RdCost.cpp
index e5976dc0d3a7101a0d12b0850ff3f23700f3e648..fea6c564223319aa6568fa4b47f4a03a8cdc07c2 100644
--- a/source/Lib/CommonLib/RdCost.cpp
+++ b/source/Lib/CommonLib/RdCost.cpp
@@ -177,8 +177,9 @@ void RdCost::init()
m_motionLambda = 0;
m_iCostScale = 0;
#if JVET_M0427_INLOOP_RESHAPER
- m_iSignalType = RESHAPE_SIGNAL_NULL;
- m_chroma_weight = 1.0;
+ m_signalType = RESHAPE_SIGNAL_NULL;
+ m_chromaWeight = 1.0;
+ m_lumaBD = 10;
#endif
}
@@ -2862,11 +2863,14 @@ Distortion RdCost::xGetHADs( const DistParam &rcDtParam )
#if WCG_EXT
-double RdCost::m_lumaLevelToWeightPLUT[LUMA_LEVEL_TO_DQP_LUT_MAXSIZE];
#if JVET_M0427_INLOOP_RESHAPER
-double RdCost::m_reshapeLumaLevelToWeightPLUT[LUMA_LEVEL_TO_DQP_LUT_MAXSIZE];
-uint32_t RdCost::m_iSignalType;
-double RdCost::m_chroma_weight;
+uint32_t RdCost::m_signalType;
+double RdCost::m_chromaWeight;
+int RdCost::m_lumaBD;
+std::vector<double> RdCost::m_reshapeLumaLevelToWeightPLUT;
+std::vector<double> RdCost::m_lumaLevelToWeightPLUT;
+#else
+double RdCost::m_lumaLevelToWeightPLUT[LUMA_LEVEL_TO_DQP_LUT_MAXSIZE];
#endif
void RdCost::saveUnadjustedLambda()
@@ -2877,18 +2881,6 @@ void RdCost::saveUnadjustedLambda()
void RdCost::initLumaLevelToWeightTable()
{
-#if JVET_M0427_INLOOP_RESHAPER
- if (m_iSignalType == RESHAPE_SIGNAL_SDR)
- {
- double weight = 1.0;
- for (int i = 0; i < LUMA_LEVEL_TO_DQP_LUT_MAXSIZE; i++)
- {
- m_lumaLevelToWeightPLUT[i] = weight;
- }
- return;
- }
-#endif
-
for (int i = 0; i < LUMA_LEVEL_TO_DQP_LUT_MAXSIZE; i++) {
double x = i;
double y;
@@ -2910,15 +2902,33 @@ void RdCost::initLumaLevelToWeightTable()
m_lumaLevelToWeightPLUT[i] = pow(2.0, y / 3.0); // or power(10, dQp/10) they are almost equal
}
-#if JVET_M0427_INLOOP_RESHAPER
- memcpy(m_reshapeLumaLevelToWeightPLUT, m_lumaLevelToWeightPLUT, LUMA_LEVEL_TO_DQP_LUT_MAXSIZE * sizeof(double));
-#endif
}
#if JVET_M0427_INLOOP_RESHAPER
+void RdCost::initLumaLevelToWeightTableReshape()
+{
+ int lutSize = 1 << m_lumaBD;
+ if (m_reshapeLumaLevelToWeightPLUT.empty())
+ m_reshapeLumaLevelToWeightPLUT.resize(lutSize, 1.0);
+ if (m_lumaLevelToWeightPLUT.empty())
+ m_lumaLevelToWeightPLUT.resize(lutSize, 1.0);
+ if (m_signalType == RESHAPE_SIGNAL_PQ)
+ {
+ for (int i = 0; i < (1 << m_lumaBD); i++)
+ {
+ double x = m_lumaBD < 10 ? i << (10 - m_lumaBD) : m_lumaBD > 10 ? i >> (m_lumaBD - 10) : i;
+ double y;
+ y = 0.015*x - 1.5 - 6;
+ y = y < -3 ? -3 : (y > 6 ? 6 : y);
+ m_reshapeLumaLevelToWeightPLUT[i] = pow(2.0, y / 3.0);
+ m_lumaLevelToWeightPLUT[i] = m_reshapeLumaLevelToWeightPLUT[i];
+ }
+ }
+}
+
void RdCost::updateReshapeLumaLevelToWeightTableChromaMD(std::vector<Pel>& ILUT)
{
- for (int i = 0; i < LUMA_LEVEL_TO_DQP_LUT_MAXSIZE; i++) // idx in reshaped domain;
+ for (int i = 0; i < (1 << m_lumaBD); i++)
{
m_reshapeLumaLevelToWeightPLUT[i] = m_lumaLevelToWeightPLUT[ILUT[i]];
}
@@ -2926,19 +2936,21 @@ void RdCost::updateReshapeLumaLevelToWeightTableChromaMD(std::vector<Pel>& ILUT)
void RdCost::restoreReshapeLumaLevelToWeightTable()
{
- memcpy(m_reshapeLumaLevelToWeightPLUT, m_lumaLevelToWeightPLUT, LUMA_LEVEL_TO_DQP_LUT_MAXSIZE * sizeof(double));
+ for (int i = 0; i < (1 << m_lumaBD); i++)
+ {
+ m_reshapeLumaLevelToWeightPLUT.at(i) = m_lumaLevelToWeightPLUT.at(i);
+ }
}
-
-void RdCost::updateReshapeLumaLevelToWeightTable(sliceReshapeInfo &sliceReshape, Pel *wt_table, double cwt)
+void RdCost::updateReshapeLumaLevelToWeightTable(sliceReshapeInfo &sliceReshape, Pel *wtTable, double cwt)
{
- if (m_iSignalType == RESHAPE_SIGNAL_SDR)
+ if (m_signalType == RESHAPE_SIGNAL_SDR)
{
if (sliceReshape.getSliceReshapeModelPresentFlag())
{
- double w_bin = 1.0;
+ double wBin = 1.0;
double weight = 1.0;
- int hist_lens = MAX_LUMA_RESHAPING_LUT_SIZE / PIC_CODE_CW_BINS;
+ int histLens = (1 << m_lumaBD) / PIC_CODE_CW_BINS;
for (int i = 0; i < PIC_CODE_CW_BINS; i++)
{
@@ -2946,21 +2958,21 @@ void RdCost::updateReshapeLumaLevelToWeightTable(sliceReshapeInfo &sliceReshape,
weight = 1.0;
else
{
- if (sliceReshape.reshape_model_bin_CW_delta[i] == 1 || sliceReshape.reshape_model_bin_CW_delta[i] == -1 * MAX_LUMA_RESHAPING_LUT_SIZE / PIC_CODE_CW_BINS)
- weight = w_bin;
+ if (sliceReshape.reshape_model_bin_CW_delta[i] == 1 || (sliceReshape.reshape_model_bin_CW_delta[i] == -1 * histLens))
+ weight = wBin;
else
{
- weight = (double)wt_table[i] / (double)hist_lens;
+ weight = (double)wtTable[i] / (double)histLens;
weight = weight*weight;
}
}
- for (int j = 0; j < hist_lens; j++)
+ for (int j = 0; j < histLens; j++)
{
- int ii = i*hist_lens + j;
+ int ii = i*histLens + j;
m_reshapeLumaLevelToWeightPLUT[ii] = weight;
}
}
- m_chroma_weight = cwt;
+ m_chromaWeight = cwt;
}
else
{
@@ -2987,13 +2999,13 @@ Distortion RdCost::getWeightedMSE(int compIdx, const Pel org, const Pel cur, con
// use luma to get weight
#if JVET_M0427_INLOOP_RESHAPER
double weight = 1.0;
- if (m_iSignalType == RESHAPE_SIGNAL_SDR)
+ if (m_signalType == RESHAPE_SIGNAL_SDR)
{
if (compIdx == COMPONENT_Y)
weight = m_reshapeLumaLevelToWeightPLUT[orgLuma];
else
{
- weight = m_chroma_weight;
+ weight = m_chromaWeight;
}
}
else
diff --git a/source/Lib/CommonLib/RdCost.h b/source/Lib/CommonLib/RdCost.h
index 23d2aafa56d493fd2325cc1f21891b24b5d4da30..d031f6e0766910a916d20022a6a4747336438c51 100644
--- a/source/Lib/CommonLib/RdCost.h
+++ b/source/Lib/CommonLib/RdCost.h
@@ -107,11 +107,14 @@ private:
#if WCG_EXT
double m_dLambda_unadjusted; // TODO: check is necessary
double m_DistScaleUnadjusted;
- static double m_lumaLevelToWeightPLUT[LUMA_LEVEL_TO_DQP_LUT_MAXSIZE];
#if JVET_M0427_INLOOP_RESHAPER
- static double m_reshapeLumaLevelToWeightPLUT[LUMA_LEVEL_TO_DQP_LUT_MAXSIZE];
- static uint32_t m_iSignalType;
- static double m_chroma_weight;
+ static std::vector<double> m_reshapeLumaLevelToWeightPLUT;
+ static std::vector<double> m_lumaLevelToWeightPLUT;
+ static uint32_t m_signalType;
+ static double m_chromaWeight;
+ static int m_lumaBD;
+#else
+ static double m_lumaLevelToWeightPLUT[LUMA_LEVEL_TO_DQP_LUT_MAXSIZE];
#endif
#endif
double m_DistScale;
@@ -296,13 +299,13 @@ public:
void initLumaLevelToWeightTable ();
inline double getWPSNRLumaLevelWeight (int val) { return m_lumaLevelToWeightPLUT[val]; }
#if JVET_M0427_INLOOP_RESHAPER
+ void initLumaLevelToWeightTableReshape();
void updateReshapeLumaLevelToWeightTableChromaMD (std::vector<Pel>& ILUT);
void restoreReshapeLumaLevelToWeightTable ();
- inline double getWPSNRReshapeLumaLevelWeight (int val) { return m_reshapeLumaLevelToWeightPLUT[val]; }
- uint32_t getReshapeSignalType () const { return m_iSignalType; }
- void setReshapeSignalType (uint32_t type) { m_iSignalType = type; }
- void updateReshapeLumaLevelToWeightTable (sliceReshapeInfo &sliceReshape, Pel *wt_table, double cwt);
- inline double* getLumaLevelWeightTable() { return m_lumaLevelToWeightPLUT; }
+ inline double getWPSNRReshapeLumaLevelWeight (int val) { return m_reshapeLumaLevelToWeightPLUT[val]; }
+ void setReshapeInfo (uint32_t type, int lumaBD) { m_signalType = type; m_lumaBD = lumaBD; }
+ void updateReshapeLumaLevelToWeightTable (sliceReshapeInfo &sliceReshape, Pel *wtTable, double cwt);
+ inline std::vector<double>& getLumaLevelWeightTable () { return m_lumaLevelToWeightPLUT; }
#endif
#endif
diff --git a/source/Lib/CommonLib/Reshape.cpp b/source/Lib/CommonLib/Reshape.cpp
index 099b5cb54bbf7b32c3e7a6502fdb623b4beeca8d..62130dd6573289ff2d445da277d858cf5e606345 100644
--- a/source/Lib/CommonLib/Reshape.cpp
+++ b/source/Lib/CommonLib/Reshape.cpp
@@ -51,25 +51,27 @@ Reshape::Reshape()
m_bCTUFlag = false;
m_bRecReshaped = false;
m_bReshape = true;
- m_uiCWOrg = MAX_LUMA_RESHAPING_LUT_SIZE / PIC_CODE_CW_BINS;
}
Reshape::~Reshape()
{
}
-void Reshape::create_dec()
+void Reshape::createDec(int bitDepth)
{
+ m_lumaBD = bitDepth;
+ m_reshapeLUTSize = 1 << m_lumaBD;
+ m_initCW = m_reshapeLUTSize / PIC_CODE_CW_BINS;
if (forwardReshapingLUT.empty())
- forwardReshapingLUT.resize(MAX_LUMA_RESHAPING_LUT_SIZE, 0);
+ forwardReshapingLUT.resize(m_reshapeLUTSize, 0);
if (inverseReshapingLUT.empty())
- inverseReshapingLUT.resize(MAX_LUMA_RESHAPING_LUT_SIZE, 0);
- if (m_uiBinCWAll.empty())
- m_uiBinCWAll.resize(PIC_CODE_CW_BINS, 0);
- if (m_ReshapePivot.empty())
- m_ReshapePivot.resize(PIC_CODE_CW_BINS + 1, 0);
- if (ChromaAdjHelpLUT.empty())
- ChromaAdjHelpLUT.resize(PIC_CODE_CW_BINS, 2048);
+ inverseReshapingLUT.resize(m_reshapeLUTSize, 0);
+ if (m_binCW.empty())
+ m_binCW.resize(PIC_CODE_CW_BINS, 0);
+ if (m_reshapePivot.empty())
+ m_reshapePivot.resize(PIC_CODE_CW_BINS + 1, 0);
+ if (m_chromaAdjHelpLUT.empty())
+ m_chromaAdjHelpLUT.resize(PIC_CODE_CW_BINS, 1<<CSCALE_FP_PREC);
}
void Reshape::destroy()
@@ -82,38 +84,38 @@ void Reshape::destroy()
\retval OutputLUT describing the inversed LUT of InputLUT
\param lut_size size of LUT in number of samples
*/
-void Reshape::ReverseLUT(std::vector<Pel>& InputLUT, std::vector<Pel>& OutputLUT, uint16_t lut_size)
+void Reshape::reverseLUT(std::vector<Pel>& inputLUT, std::vector<Pel>& outputLUT, uint16_t lutSize)
{
int i, j;
- OutputLUT[m_ReshapePivot[m_sliceReshapeInfo.reshape_model_min_bin_idx]] = m_sliceReshapeInfo.reshape_model_min_bin_idx*m_uiCWOrg;
+ outputLUT[m_reshapePivot[m_sliceReshapeInfo.reshape_model_min_bin_idx]] = m_sliceReshapeInfo.reshape_model_min_bin_idx*m_initCW;
for (i = m_sliceReshapeInfo.reshape_model_min_bin_idx; i <= m_sliceReshapeInfo.reshape_model_max_bin_idx; i++)
{
- int16_t X1 = m_ReshapePivot[i];
- int16_t X2 = m_ReshapePivot[i + 1];
- OutputLUT[X2] = (i + 1)*m_uiCWOrg;
- int16_t Y1 = OutputLUT[X1];
- int16_t Y2 = OutputLUT[X2];
+ int16_t X1 = m_reshapePivot[i];
+ int16_t X2 = m_reshapePivot[i + 1];
+ outputLUT[X2] = (i + 1)*m_initCW;
+ int16_t Y1 = outputLUT[X1];
+ int16_t Y2 = outputLUT[X2];
if (X2 !=X1)
{
int32_t scale = (int32_t)(Y2 - Y1) * (1 << FP_PREC) / (int32_t)(X2 - X1);
for (j = X1 + 1; j < X2; j++)
{
- OutputLUT[j] = (Pel)((scale*(int32_t)(j - X1) + (1 << (FP_PREC - 1))) >> FP_PREC) + Y1;
+ outputLUT[j] = (Pel)((scale*(int32_t)(j - X1) + (1 << (FP_PREC - 1))) >> FP_PREC) + Y1;
}
}
}
- for (i = 0; i < m_ReshapePivot[m_sliceReshapeInfo.reshape_model_min_bin_idx]; i++)
- OutputLUT[i] = OutputLUT[m_ReshapePivot[m_sliceReshapeInfo.reshape_model_min_bin_idx]];
- for (i = m_ReshapePivot[m_sliceReshapeInfo.reshape_model_max_bin_idx + 1]; i < MAX_LUMA_RESHAPING_LUT_SIZE; i++)
- OutputLUT[i] = OutputLUT[m_ReshapePivot[m_sliceReshapeInfo.reshape_model_max_bin_idx + 1]];
+ for (i = 0; i < m_reshapePivot[m_sliceReshapeInfo.reshape_model_min_bin_idx]; i++)
+ outputLUT[i] = outputLUT[m_reshapePivot[m_sliceReshapeInfo.reshape_model_min_bin_idx]];
+ for (i = m_reshapePivot[m_sliceReshapeInfo.reshape_model_max_bin_idx + 1]; i < m_reshapeLUTSize; i++)
+ outputLUT[i] = outputLUT[m_reshapePivot[m_sliceReshapeInfo.reshape_model_max_bin_idx + 1]];
bool clipRange = ((m_sliceReshapeInfo.reshape_model_min_bin_idx > 0) && (m_sliceReshapeInfo.reshape_model_max_bin_idx < (PIC_CODE_CW_BINS - 1)));
- for (i = 0; i < lut_size; i++)
+ for (i = 0; i < lutSize; i++)
{
- if (clipRange) OutputLUT[i] = Clip3((Pel)64, (Pel)940, OutputLUT[i]);
- else OutputLUT[i] = Clip3((Pel)0, (Pel)1023, OutputLUT[i]);
+ if (clipRange) outputLUT[i] = Clip3((Pel)(16<<(m_lumaBD-8)), (Pel)(235<<(m_lumaBD-8)), outputLUT[i]);
+ else outputLUT[i] = Clip3((Pel)0, (Pel)((1<<m_lumaBD)-1), outputLUT[i]);
}
}
@@ -124,8 +126,8 @@ void Reshape::ReverseLUT(std::vector<Pel>& InputLUT, std::vector<Pel>& OutputLUT
*/
int Reshape::calculateChromaAdj(Pel avgLuma)
{
- int lumaIdx = Clip3<int>(0, int(LUMA_LEVEL_TO_DQP_LUT_MAXSIZE) - 1, avgLuma);
- int iAdj = ChromaAdjHelpLUT[getPWLIdxInv(lumaIdx)];
+ int lumaIdx = Clip3<int>(0, (1<<m_lumaBD) - 1, avgLuma);
+ int iAdj = m_chromaAdjHelpLUT[getPWLIdxInv(lumaIdx)];
return(iAdj);
}
@@ -137,15 +139,15 @@ int Reshape::calculateChromaAdj(Pel avgLuma)
int Reshape::getPWLIdxInv(int lumaVal)
{
int idxS = 0;
- if (lumaVal < m_ReshapePivot[m_sliceReshapeInfo.reshape_model_min_bin_idx + 1])
+ if (lumaVal < m_reshapePivot[m_sliceReshapeInfo.reshape_model_min_bin_idx + 1])
return m_sliceReshapeInfo.reshape_model_min_bin_idx;
- else if (lumaVal >= m_ReshapePivot[m_sliceReshapeInfo.reshape_model_max_bin_idx])
+ else if (lumaVal >= m_reshapePivot[m_sliceReshapeInfo.reshape_model_max_bin_idx])
return m_sliceReshapeInfo.reshape_model_max_bin_idx;
else
{
for (idxS = m_sliceReshapeInfo.reshape_model_min_bin_idx; (idxS < m_sliceReshapeInfo.reshape_model_max_bin_idx); idxS++)
{
- if (lumaVal < m_ReshapePivot[idxS + 1]) break;
+ if (lumaVal < m_reshapePivot[idxS + 1]) break;
}
return idxS;
}
@@ -180,33 +182,33 @@ void Reshape::copySliceReshaperInfo(sliceReshapeInfo& tInfo, sliceReshapeInfo& s
void Reshape::constructReshaper()
{
int pwlFwdLUTsize = PIC_CODE_CW_BINS;
- int pwlFwdBinLen = MAX_LUMA_RESHAPING_LUT_SIZE / PIC_CODE_CW_BINS;
+ int pwlFwdBinLen = m_reshapeLUTSize / PIC_CODE_CW_BINS;
for (int i = 0; i < m_sliceReshapeInfo.reshape_model_min_bin_idx; i++)
- m_uiBinCWAll[i] = 0;
+ m_binCW[i] = 0;
for (int i = m_sliceReshapeInfo.reshape_model_max_bin_idx + 1; i < PIC_CODE_CW_BINS; i++)
- m_uiBinCWAll[i] = 0;
+ m_binCW[i] = 0;
for (int i = m_sliceReshapeInfo.reshape_model_min_bin_idx; i <= m_sliceReshapeInfo.reshape_model_max_bin_idx; i++)
- m_uiBinCWAll[i] = (uint16_t)(m_sliceReshapeInfo.reshape_model_bin_CW_delta[i] + (int)m_uiCWOrg);
+ m_binCW[i] = (uint16_t)(m_sliceReshapeInfo.reshape_model_bin_CW_delta[i] + (int)m_initCW);
for (int i = 0; i < pwlFwdLUTsize; i++)
{
- m_ReshapePivot[i + 1] = m_ReshapePivot[i] + m_uiBinCWAll[i];
- int16_t Y1 = m_ReshapePivot[i];
- int16_t Y2 = m_ReshapePivot[i + 1];
+ m_reshapePivot[i + 1] = m_reshapePivot[i] + m_binCW[i];
+ int16_t Y1 = m_reshapePivot[i];
+ int16_t Y2 = m_reshapePivot[i + 1];
- forwardReshapingLUT[i*pwlFwdBinLen] = Clip3((Pel)0, (Pel)1023, (Pel)Y1);
+ forwardReshapingLUT[i*pwlFwdBinLen] = Clip3((Pel)0, (Pel)((1 << m_lumaBD) - 1), (Pel)Y1);
- int log2_pwlFwdBinLen = log2_MAX_LUMA_RESHAPING_LUT_SIZE - log2_PIC_CODE_CW_BINS;
+ int log2_pwlFwdBinLen = g_aucLog2[pwlFwdBinLen];
int32_t scale = ((int32_t)(Y2 - Y1) * (1 << FP_PREC) + (1 << (log2_pwlFwdBinLen - 1))) >> (log2_pwlFwdBinLen);
for (int j = 1; j < pwlFwdBinLen; j++)
{
int tempVal = Y1 + (((int32_t)scale * (int32_t)j + (1 << (FP_PREC - 1))) >> FP_PREC);
- forwardReshapingLUT[i*pwlFwdBinLen + j] = Clip3((Pel)0, (Pel)1023, (Pel)tempVal);
+ forwardReshapingLUT[i*pwlFwdBinLen + j] = Clip3((Pel)0, (Pel)((1 << m_lumaBD) - 1), (Pel)tempVal);
}
}
- ReverseLUT(forwardReshapingLUT, inverseReshapingLUT, MAX_LUMA_RESHAPING_LUT_SIZE);
+ reverseLUT(forwardReshapingLUT, inverseReshapingLUT, m_reshapeLUTSize);
updateChromaDQPLUT();
}
@@ -219,10 +221,11 @@ void Reshape::updateChromaDQPLUT()
const int16_t CW_bin_SC_LUT[2 * PIC_ANALYZE_CW_BINS] = { 16384, 16384, 16384, 16384, 16384, 16384, 16384, 8192, 8192, 8192, 8192, 5461, 5461, 5461, 5461, 4096, 4096, 4096, 4096, 3277, 3277, 3277, 3277, 2731, 2731, 2731, 2731, 2341, 2341, 2341, 2048, 2048, 2048, 1820, 1820, 1820, 1638, 1638, 1638, 1638, 1489, 1489, 1489, 1489, 1365, 1365, 1365, 1365, 1260, 1260, 1260, 1260, 1170, 1170, 1170, 1170, 1092, 1092, 1092, 1092, 1024, 1024, 1024, 1024 }; //p=11
for (int i = 0; i < PIC_CODE_CW_BINS; i++)
{
+ uint16_t binCW = m_lumaBD > 10 ? (m_binCW[i] >> (m_lumaBD - 10)) : m_lumaBD < 10 ? (m_binCW[i] << (10 -m_lumaBD)): m_binCW[i];
if ((i < m_sliceReshapeInfo.reshape_model_min_bin_idx) || (i > m_sliceReshapeInfo.reshape_model_max_bin_idx))
- ChromaAdjHelpLUT[i] = 1 << CSCALE_FP_PREC;
+ m_chromaAdjHelpLUT[i] = 1 << CSCALE_FP_PREC;
else
- ChromaAdjHelpLUT[i] = CW_bin_SC_LUT[Clip3((uint16_t)1, (uint16_t)64, (uint16_t)(m_uiBinCWAll[i] >> 1)) - 1];
+ m_chromaAdjHelpLUT[i] = CW_bin_SC_LUT[Clip3((uint16_t)1, (uint16_t)64, (uint16_t)(binCW >> 1)) - 1];
}
}
#endif
diff --git a/source/Lib/CommonLib/Reshape.h b/source/Lib/CommonLib/Reshape.h
index 4fec33805e2649aee2b4da19e16cce647cb5f078..9fe04dc35ed6744adaed0a0eb4fbb9ff1a94142e 100644
--- a/source/Lib/CommonLib/Reshape.h
+++ b/source/Lib/CommonLib/Reshape.h
@@ -60,22 +60,24 @@ protected:
bool m_bRecReshaped;
std::vector<Pel> inverseReshapingLUT;
std::vector<Pel> forwardReshapingLUT;
- std::vector<int> ChromaAdjHelpLUT;
- std::vector<uint16_t> m_uiBinCWAll;
- uint16_t m_uiCWOrg;
+ std::vector<int> m_chromaAdjHelpLUT;
+ std::vector<uint16_t> m_binCW;
+ uint16_t m_initCW;
bool m_bReshape;
- std::vector<Pel> m_ReshapePivot;
+ std::vector<Pel> m_reshapePivot;
+ int m_lumaBD;
+ int m_reshapeLUTSize;
public:
Reshape();
~Reshape();
- void create_dec();
+ void createDec(int bitDepth);
void destroy();
- void ReverseLUT(std::vector<Pel>& InputLUT, std::vector<Pel>& OutputLUT, uint16_t lut_size);
+ void reverseLUT(std::vector<Pel>& inputLUT, std::vector<Pel>& outputLUT, uint16_t lutSize);
std::vector<Pel>& getFwdLUT() { return forwardReshapingLUT; }
std::vector<Pel>& getInvLUT() { return inverseReshapingLUT; }
- std::vector<int>& getChromaAdjHelpLUT() { return ChromaAdjHelpLUT; }
+ std::vector<int>& getChromaAdjHelpLUT() { return m_chromaAdjHelpLUT; }
bool getCTUFlag() { return m_bCTUFlag; }
void setCTUFlag(bool bCTUFlag) { m_bCTUFlag = bCTUFlag; }
diff --git a/source/Lib/CommonLib/Unit.cpp b/source/Lib/CommonLib/Unit.cpp
index 536d640ce488c57be784b649a8d2f723208f99ab..a9a73b92c7d4f069904870e95d190e039665451d 100644
--- a/source/Lib/CommonLib/Unit.cpp
+++ b/source/Lib/CommonLib/Unit.cpp
@@ -278,6 +278,10 @@ CodingUnit& CodingUnit::operator=( const CodingUnit& other )
shareParentSize = other.shareParentSize;
#endif
ibc = other.ibc;
+#if JVET_M0444_SMVD
+ smvdMode = other.smvdMode;
+#endif
+
#if JVET_M0444_SMVD
smvdMode = other.smvdMode;
#endif
@@ -323,6 +327,9 @@ void CodingUnit::initData()
#if JVET_M0444_SMVD
smvdMode = 0;
#endif
+#if JVET_M0444_SMVD
+ smvdMode = 0;
+#endif
}
diff --git a/source/Lib/CommonLib/Unit.h b/source/Lib/CommonLib/Unit.h
index 811a63dd4157be9d2143bea79d87f03867e6cb5a..4957c6bc5c7ebad4a6f449d956fccbb52b6bca29 100644
--- a/source/Lib/CommonLib/Unit.h
+++ b/source/Lib/CommonLib/Unit.h
@@ -317,6 +317,9 @@ struct CodingUnit : public UnitArea
Size shareParentSize;
#endif
bool ibc;
+#if JVET_M0444_SMVD
+ uint8_t smvdMode;
+#endif
#if JVET_M0444_SMVD
uint8_t smvdMode;
#endif
diff --git a/source/Lib/DecoderLib/DecCu.cpp b/source/Lib/DecoderLib/DecCu.cpp
index 0cc6269f21e91a3fddc331c3e0bd88ca00d69637..45c180065e9ba50dd9c3a8900bb223341cab96ad 100644
--- a/source/Lib/DecoderLib/DecCu.cpp
+++ b/source/Lib/DecoderLib/DecCu.cpp
@@ -243,7 +243,7 @@ void DecCu::xIntraRecBlk( TransformUnit& tu, const ComponentID compID )
bFlag = bFlag && (tu.blocks[compID].width*tu.blocks[compID].height > 4);
if (bFlag && TU::getCbf(tu, compID) && isChroma(compID) && slice.getReshapeInfo().getSliceReshapeChromaAdj())
{
- piResi.scaleSignal(tu.getChromaAdj(), 0);
+ piResi.scaleSignal(tu.getChromaAdj(), 0, tu.cu->cs->slice->clpRng(compID));
}
#endif
if( isChroma(compID) && tu.compAlpha[compID] != 0 )
@@ -570,7 +570,7 @@ void DecCu::xDecodeInterTU( TransformUnit & currTU, const ComponentID compID )
const Slice &slice = *cs.slice;
if ( slice.getReshapeInfo().getUseSliceReshaper() && m_pcReshape->getCTUFlag() && isChroma(compID) && TU::getCbf(currTU, compID) && slice.getReshapeInfo().getSliceReshapeChromaAdj() && currTU.blocks[compID].width*currTU.blocks[compID].height > 4 )
{
- resiBuf.scaleSignal(currTU.getChromaAdj(), 0);
+ resiBuf.scaleSignal(currTU.getChromaAdj(), 0, currTU.cu->cs->slice->clpRng(compID));
}
#endif
if( isChroma( compID ) && currTU.compAlpha[compID] != 0 )
diff --git a/source/Lib/DecoderLib/DecLib.cpp b/source/Lib/DecoderLib/DecLib.cpp
index 1bc6e1227d9a43bf963338c9f31febf4da3530da..460d5e5e09d3566a8a0cc91bbfd461a510969c48 100644
--- a/source/Lib/DecoderLib/DecLib.cpp
+++ b/source/Lib/DecoderLib/DecLib.cpp
@@ -756,7 +756,7 @@ void DecLib::xActivateParameterSets()
#if JVET_M0427_INLOOP_RESHAPER
if (sps->getUseReshaper())
{
- m_cReshaper.create_dec();
+ m_cReshaper.createDec(sps->getBitDepth(CHANNEL_TYPE_LUMA));
}
#endif
diff --git a/source/Lib/DecoderLib/VLCReader.cpp b/source/Lib/DecoderLib/VLCReader.cpp
index 44d883e21b20171a06666893e63a78469ec20e88..a3c1c8c90d5e8df4e75f7ce17a72aa41fa495720 100644
--- a/source/Lib/DecoderLib/VLCReader.cpp
+++ b/source/Lib/DecoderLib/VLCReader.cpp
@@ -854,25 +854,29 @@ void HLSyntaxReader::parseSPSNext( SPSNext& spsNext, const bool usePCM )
}
#if JVET_M0427_INLOOP_RESHAPER
-void HLSyntaxReader::parseReshaper (sliceReshapeInfo& info, const SPS* pcSPS, const bool isIntra)
+void HLSyntaxReader::parseReshaper(sliceReshapeInfo& info, const SPS* pcSPS, const bool isIntra)
{
unsigned symbol = 0;
- READ_FLAG(symbol, "slice_reshape_model_present_flag"); info.setSliceReshapeModelPresentFlag(symbol == 1);
+ READ_FLAG(symbol, "slice_reshape_model_present_flag"); info.setSliceReshapeModelPresentFlag(symbol == 1);
if (info.getSliceReshapeModelPresentFlag())
{
// parse slice reshaper model
memset(info.reshape_model_bin_CW_delta, 0, PIC_CODE_CW_BINS * sizeof(int));
- READ_UVLC(symbol, "reshaper_model_min_bin_idx"); info.reshape_model_min_bin_idx = symbol;
- READ_UVLC(symbol, "max_bin_minus_reshape_model_max_bin_idx"); info.reshape_model_max_bin_idx = PIC_CODE_CW_BINS - 1 - symbol;
- READ_UVLC(symbol, "reshaper_model_bin_delta_abs_cw_prec_minus1"); info.maxNbitsNeededDeltaCW = symbol+1;
- assert(info.maxNbitsNeededDeltaCW > 0);
- for (uint32_t i = info.reshape_model_min_bin_idx; i <= info.reshape_model_max_bin_idx; i++)
+ READ_UVLC(symbol, "reshaper_model_min_bin_idx"); info.reshape_model_min_bin_idx = symbol;
+ READ_UVLC(symbol, "max_bin_minus_reshape_model_max_bin_idx"); info.reshape_model_max_bin_idx = PIC_CODE_CW_BINS - 1 - symbol;
+ READ_UVLC(symbol, "reshaper_model_bin_delta_abs_cw_prec_minus1"); info.maxNbitsNeededDeltaCW = symbol + 1;
+ assert(info.maxNbitsNeededDeltaCW > 0);
+ for (uint32_t i = info.reshape_model_min_bin_idx; i <= info.reshape_model_max_bin_idx; i++)
+ {
+ READ_CODE(info.maxNbitsNeededDeltaCW, symbol, "reshape_model_abs_CW");
+ int absCW = symbol;
+ if (absCW > 0)
{
- READ_CODE(info.maxNbitsNeededDeltaCW, symbol, "reshape_model_abs_CW"); int absCW = symbol;
- if (absCW > 0)
- READ_CODE(1, symbol, "reshape_model_sign_CW"); int signCW = symbol;
- info.reshape_model_bin_CW_delta[i] = (1 - 2 * signCW) * absCW;
+ READ_CODE(1, symbol, "reshape_model_sign_CW");
}
+ int signCW = symbol;
+ info.reshape_model_bin_CW_delta[i] = (1 - 2 * signCW) * absCW;
+ }
}
READ_FLAG(symbol, "slice_reshaper_enable_flag"); info.setUseSliceReshaper(symbol == 1);
diff --git a/source/Lib/EncoderLib/EncAdaptiveLoopFilter.cpp b/source/Lib/EncoderLib/EncAdaptiveLoopFilter.cpp
index 97340a54673445c765aa11b6e10e65c1f1c52a47..1cab68f20b39910504f441e7a2ea14f136434f07 100644
--- a/source/Lib/EncoderLib/EncAdaptiveLoopFilter.cpp
+++ b/source/Lib/EncoderLib/EncAdaptiveLoopFilter.cpp
@@ -41,7 +41,7 @@
#define AlfCtx(c) SubCtx( Ctx::ctbAlfFlag, c )
#if JVET_M0427_INLOOP_RESHAPER
-double EncAdaptiveLoopFilter::m_lumaLevelToWeightPLUT[LUMA_LEVEL_TO_DQP_LUT_MAXSIZE];
+std::vector<double> EncAdaptiveLoopFilter::m_lumaLevelToWeightPLUT;
#endif
EncAdaptiveLoopFilter::EncAdaptiveLoopFilter()
@@ -1480,7 +1480,11 @@ void EncAdaptiveLoopFilter::getBlkStats( AlfCovariance* alfCovariace, const AlfF
}
#if JVET_M0427_INLOOP_RESHAPER
- double weight = m_lumaLevelToWeightPLUT[org[j]];
+ double weight = 1.0;
+ if (m_alfWSSD)
+ {
+ weight = m_lumaLevelToWeightPLUT[org[j]];
+ }
#endif
int yLocal = org[j] - rec[j];
calcCovariance( ELocal, rec + j, recStride, shape.pattern.data(), shape.filterLength >> 1, transposeIdx );
diff --git a/source/Lib/EncoderLib/EncAdaptiveLoopFilter.h b/source/Lib/EncoderLib/EncAdaptiveLoopFilter.h
index 81a4ee2d024a066600efa37d385b09fd1d65064b..1a0a67a4326c062232722c0b7e1dc9583756a6cc 100644
--- a/source/Lib/EncoderLib/EncAdaptiveLoopFilter.h
+++ b/source/Lib/EncoderLib/EncAdaptiveLoopFilter.h
@@ -154,8 +154,8 @@ public:
#if JVET_M0427_INLOOP_RESHAPER
int m_alfWSSD;
inline void setAlfWSSD(int alfWSSD) { m_alfWSSD = alfWSSD; }
- static double m_lumaLevelToWeightPLUT[LUMA_LEVEL_TO_DQP_LUT_MAXSIZE];
- inline double* getLumaLevelWeightTable() { return m_lumaLevelToWeightPLUT; }
+ static std::vector<double> m_lumaLevelToWeightPLUT;
+ inline std::vector<double>& getLumaLevelWeightTable() { return m_lumaLevelToWeightPLUT; }
#endif
private:
diff --git a/source/Lib/EncoderLib/EncGOP.cpp b/source/Lib/EncoderLib/EncGOP.cpp
index 93e6d85bb71195adaf0d9653cd8736113b40f0a3..4a2ab3c45a5b09ca0d74a7bd33ab3108595b2e77 100644
--- a/source/Lib/EncoderLib/EncGOP.cpp
+++ b/source/Lib/EncoderLib/EncGOP.cpp
@@ -180,18 +180,22 @@ void EncGOP::init ( EncLib* pcEncLib )
#if WCG_EXT
#if JVET_M0427_INLOOP_RESHAPER
if (m_pcCfg->getReshaper())
- pcEncLib->getRdCost()->setReshapeSignalType(m_pcCfg->getReshapeSignalType());
+ {
+ pcEncLib->getRdCost()->setReshapeInfo(m_pcCfg->getReshapeSignalType(), m_pcCfg->getBitDepth(CHANNEL_TYPE_LUMA));
+ pcEncLib->getRdCost()->initLumaLevelToWeightTableReshape();
+ }
+ else if (m_pcCfg->getLumaLevelToDeltaQPMapping().mode)
+ {
#endif
- pcEncLib->getRdCost()->initLumaLevelToWeightTable();
+ pcEncLib->getRdCost()->initLumaLevelToWeightTable();
#if JVET_M0427_INLOOP_RESHAPER
- memcpy(pcEncLib->getALF()->getLumaLevelWeightTable(), pcEncLib->getRdCost()->getLumaLevelWeightTable(), LUMA_LEVEL_TO_DQP_LUT_MAXSIZE * sizeof(double));
+ }
+ pcEncLib->getALF()->getLumaLevelWeightTable() = pcEncLib->getRdCost()->getLumaLevelWeightTable();
int alfWSSD = 0;
-
if (m_pcCfg->getReshaper() && m_pcCfg->getReshapeSignalType() == RESHAPE_SIGNAL_PQ )
{
alfWSSD = 1;
}
-
pcEncLib->getALF()->setAlfWSSD(alfWSSD);
#endif
#endif
diff --git a/source/Lib/EncoderLib/EncLib.cpp b/source/Lib/EncoderLib/EncLib.cpp
index b8ff0a60ecea89c0aec5db312426ceef25cdb0e6..1a5224e9044924d701fa44391e13126fd0ed0c4e 100644
--- a/source/Lib/EncoderLib/EncLib.cpp
+++ b/source/Lib/EncoderLib/EncLib.cpp
@@ -139,7 +139,7 @@ void EncLib::create ()
#if JVET_M0427_INLOOP_RESHAPER
if (m_bUseReshape)
{
- m_cReshaper.create_enc( getSourceWidth(), getSourceHeight(), m_maxCUWidth, m_maxCUHeight );
+ m_cReshaper.createEnc( getSourceWidth(), getSourceHeight(), m_maxCUWidth, m_maxCUHeight, m_bitDepth[COMPONENT_Y]);
}
#endif
if ( m_RCEnableRateControl )
diff --git a/source/Lib/EncoderLib/EncReshape.cpp b/source/Lib/EncoderLib/EncReshape.cpp
index 70906096223a4d47d8efdc52d437a492b04e8aa5..aa16362067d1039b385b4246e61ffcc77c6744c5 100644
--- a/source/Lib/EncoderLib/EncReshape.cpp
+++ b/source/Lib/EncoderLib/EncReshape.cpp
@@ -53,8 +53,6 @@ EncReshape::EncReshape()
m_bRecReshaped = false;
m_bReshape = true;
m_bExceedSTD = false;
- m_uiCWOrgAnalyze = MAX_LUMA_RESHAPING_LUT_SIZE / PIC_ANALYZE_CW_BINS;
- m_uiCWOrg = MAX_LUMA_RESHAPING_LUT_SIZE / PIC_CODE_CW_BINS;
m_tcase = 0;
m_rateAdpMode = 0;
m_chromaAdj = 0;
@@ -64,20 +62,25 @@ EncReshape::~EncReshape()
{
}
-void EncReshape::create_enc(int picWidth, int picHeight, uint32_t maxCUWidth, uint32_t maxCUHeight)
+void EncReshape::createEnc(int picWidth, int picHeight, uint32_t maxCUWidth, uint32_t maxCUHeight, int bitDepth)
{
+ m_lumaBD = bitDepth;
+ m_reshapeLUTSize = 1 << m_lumaBD;
+ m_initCWAnalyze = m_reshapeLUTSize / PIC_ANALYZE_CW_BINS;
+ m_initCW = m_reshapeLUTSize / PIC_CODE_CW_BINS;
+
if (forwardReshapingLUT.empty())
- forwardReshapingLUT.resize(MAX_LUMA_RESHAPING_LUT_SIZE, 0);
+ forwardReshapingLUT.resize(m_reshapeLUTSize, 0);
if (inverseReshapingLUT.empty())
- inverseReshapingLUT.resize(MAX_LUMA_RESHAPING_LUT_SIZE,0);
- if (m_uiBinCWAll.empty())
- m_uiBinCWAll.resize(PIC_ANALYZE_CW_BINS);
+ inverseReshapingLUT.resize(m_reshapeLUTSize,0);
+ if (m_binCW.empty())
+ m_binCW.resize(PIC_ANALYZE_CW_BINS);
if (m_uiBinImportance.empty())
m_uiBinImportance.resize(PIC_ANALYZE_CW_BINS);
- if (m_ReshapePivot.empty())
- m_ReshapePivot.resize(PIC_CODE_CW_BINS + 1, 0);
- if (ChromaAdjHelpLUT.empty())
- ChromaAdjHelpLUT.resize(PIC_CODE_CW_BINS, 2048);
+ if (m_reshapePivot.empty())
+ m_reshapePivot.resize(PIC_CODE_CW_BINS + 1, 0);
+ if (m_chromaAdjHelpLUT.empty())
+ m_chromaAdjHelpLUT.resize(PIC_CODE_CW_BINS, 1<<CSCALE_FP_PREC);
m_sliceReshapeInfo.setUseSliceReshaper(true);
m_sliceReshapeInfo.setSliceReshapeChromaAdj(true);
@@ -106,19 +109,27 @@ void EncReshape::destroy()
*/
void EncReshape::preAnalyzerHDR(Picture *pcPic, const SliceType sliceType, const ReshapeCW& reshapeCW, bool isDualT, bool isCPR)
{
- m_sliceReshapeInfo.slice_reshaper_enable_flag = true;
- if (reshapeCW.RspIntraPeriod == 1)
+ if (m_lumaBD == 10)
{
- if (pcPic->getPOC() == 0) { m_sliceReshapeInfo.slice_reshaper_model_present_flag = true; }
- else { m_sliceReshapeInfo.slice_reshaper_model_present_flag = false; }
+ m_sliceReshapeInfo.slice_reshaper_enable_flag = true;
+ if (reshapeCW.RspIntraPeriod == 1)
+ {
+ if (pcPic->getPOC() == 0) { m_sliceReshapeInfo.slice_reshaper_model_present_flag = true; }
+ else { m_sliceReshapeInfo.slice_reshaper_model_present_flag = false; }
+ }
+ else
+ {
+ if (sliceType == I_SLICE || (sliceType==P_SLICE && isCPR) ) { m_sliceReshapeInfo.slice_reshaper_model_present_flag = true; }
+ else { m_sliceReshapeInfo.slice_reshaper_model_present_flag = false; }
+ }
+ if ((sliceType == I_SLICE || (sliceType == P_SLICE && isCPR)) && isDualT) { m_sliceReshapeInfo.uiReshapeChromaAdj = 0; }
+ else { m_sliceReshapeInfo.uiReshapeChromaAdj = 1; }
}
else
{
- if (sliceType == I_SLICE || (sliceType==P_SLICE && isCPR) ) { m_sliceReshapeInfo.slice_reshaper_model_present_flag = true; }
- else { m_sliceReshapeInfo.slice_reshaper_model_present_flag = false; }
+ m_sliceReshapeInfo.slice_reshaper_enable_flag = false;
+ m_sliceReshapeInfo.slice_reshaper_model_present_flag = false;
}
- if ((sliceType == I_SLICE || (sliceType == P_SLICE && isCPR)) && isDualT) { m_sliceReshapeInfo.uiReshapeChromaAdj = 0; }
- else { m_sliceReshapeInfo.uiReshapeChromaAdj = 1; }
}
/**
@@ -138,24 +149,22 @@ void EncReshape::preAnalyzerSDR(Picture *pcPic, const SliceType sliceType, const
{
if (m_sliceReshapeInfo.slice_reshaper_model_present_flag == true)
{
- uint32_t uiStdMin = 16 * 4;
- uint32_t uiStdMax = 235 * 4;
- int bin_len = MAX_LUMA_RESHAPING_LUT_SIZE / PIC_ANALYZE_CW_BINS;
- uint32_t min_start_bin_idx, max_end_bin_idx;
+ uint32_t uiStdMin = 16 <<(m_lumaBD-8);
+ uint32_t uiStdMax = 235 << (m_lumaBD - 8);
+ int binLen = m_reshapeLUTSize / PIC_ANALYZE_CW_BINS;
m_reshapeCW = reshapeCW;
for (int b = 0; b < PIC_ANALYZE_CW_BINS; b++)
{
m_uiBinImportance[b] = 0;
- m_uiBinCWAll[b] = bin_len;
+ m_binCW[b] = binLen;
}
- min_start_bin_idx = int(floor((double(uiStdMin) / double(bin_len))));
- max_end_bin_idx = int(floor((double(uiStdMax) / double(bin_len))));
-
- m_sliceReshapeInfo.reshape_model_min_bin_idx = min_start_bin_idx;
- m_sliceReshapeInfo.reshape_model_max_bin_idx = max_end_bin_idx;
+ int startBinIdx = int(floor((double(uiStdMin) / double(binLen))));
+ int endBinIdx = int(floor((double(uiStdMax) / double(binLen))));
+ m_sliceReshapeInfo.reshape_model_min_bin_idx = startBinIdx;
+ m_sliceReshapeInfo.reshape_model_max_bin_idx = endBinIdx;
PelBuf picY = pcPic->getOrigBuf(COMPONENT_Y);
const int iWidth = picY.width;
@@ -164,7 +173,8 @@ void EncReshape::preAnalyzerSDR(Picture *pcPic, const SliceType sliceType, const
double dBlockBinVarSum[PIC_ANALYZE_CW_BINS] = { 0.0 };
uint32_t dBlockBinCnt[PIC_ANALYZE_CW_BINS] = { 0 };
-
+
+ const int PIC_ANALYZE_WIN_SIZE = 5;
const uint32_t uiWinSize = PIC_ANALYZE_WIN_SIZE;
const uint32_t uiWinLens = (uiWinSize - 1) >> 1;
@@ -318,6 +328,17 @@ void EncReshape::preAnalyzerSDR(Picture *pcPic, const SliceType sliceType, const
double dAverage = double(uiSum) / uiNumPixInPart;
double dVariance = double(uiSumSq) / uiNumPixInPart - dAverage * dAverage;
+
+ if (m_lumaBD > 10)
+ {
+ dAverage = dAverage / (double)(1<<(m_lumaBD - 10));
+ dVariance = dVariance / (double)(1 << (2*m_lumaBD - 20));
+ }
+ else if (m_lumaBD < 10)
+ {
+ dAverage = dAverage * (double)(1 << (10 - m_lumaBD));
+ dVariance = dVariance * (double)(1 << (20-2*m_lumaBD));
+ }
double dVarLog10 = log10(dVariance + 1.0);
uint32_t uiBinNum = (uint32_t)floor((double)pPxlY / (double)PIC_ANALYZE_CW_BINS);
@@ -368,44 +389,44 @@ void EncReshape::preAnalyzerSDR(Picture *pcPic, const SliceType sliceType, const
if (m_bExceedSTD)
{
- min_start_bin_idx = 2;
- max_end_bin_idx = 29;
+ startBinIdx = 2;
+ endBinIdx = 29;
for (int b = 0; b < PIC_ANALYZE_CW_BINS; b++)
{
- if (dBlockBinCnt[b] > 0 && b < min_start_bin_idx)
- min_start_bin_idx = b;
- if (dBlockBinCnt[b] > 0 && b > max_end_bin_idx)
- max_end_bin_idx = b;
+ if (dBlockBinCnt[b] > 0 && b < startBinIdx)
+ startBinIdx = b;
+ if (dBlockBinCnt[b] > 0 && b > endBinIdx)
+ endBinIdx = b;
}
- m_sliceReshapeInfo.reshape_model_min_bin_idx = min_start_bin_idx;
- m_sliceReshapeInfo.reshape_model_max_bin_idx = max_end_bin_idx;
+ m_sliceReshapeInfo.reshape_model_min_bin_idx = startBinIdx;
+ m_sliceReshapeInfo.reshape_model_max_bin_idx = endBinIdx;
}
if (reshapeCW.RspBaseQP <= 22 && m_rateAdpMode == 1)
{
for (int i = 0; i < PIC_ANALYZE_CW_BINS; i++)
{
- if (i >= min_start_bin_idx && i <= max_end_bin_idx)
- m_uiBinCWAll[i] = m_uiCWOrgAnalyze + 1;
+ if (i >= startBinIdx && i <= endBinIdx)
+ m_binCW[i] = m_initCWAnalyze + 1;
else
- m_uiBinCWAll[i] = 0;
+ m_binCW[i] = 0;
}
}
else if (m_bUseAdpCW)
{
double Alpha = 1.0, Beta = 0.0;
- deriveReshapeParameters(dBlockBinVarSum, min_start_bin_idx, max_end_bin_idx, m_reshapeCW, Alpha, Beta);
+ deriveReshapeParameters(dBlockBinVarSum, startBinIdx, endBinIdx, m_reshapeCW, Alpha, Beta);
for (int i = 0; i < PIC_ANALYZE_CW_BINS; i++)
{
- if (i >= min_start_bin_idx && i <= max_end_bin_idx)
- m_uiBinCWAll[i] = (uint32_t)round(Alpha*dBlockBinVarSum[i] + Beta);
+ if (i >= startBinIdx && i <= endBinIdx)
+ m_binCW[i] = (uint32_t)round(Alpha*dBlockBinVarSum[i] + Beta);
else
- m_uiBinCWAll[i] = 0;
+ m_binCW[i] = 0;
}
}
else
{
- for (int b = min_start_bin_idx; b <= max_end_bin_idx; b++)
+ for (int b = startBinIdx; b <= endBinIdx; b++)
{
if (dBlockBinVarSum[b] < dReshapeTH1)
m_uiBinImportance[b] = 2;
@@ -418,13 +439,13 @@ void EncReshape::preAnalyzerSDR(Picture *pcPic, const SliceType sliceType, const
for (int i = 0; i < PIC_ANALYZE_CW_BINS; i++)
{
if (m_uiBinImportance[i] == 0)
- m_uiBinCWAll[i] = 0;
+ m_binCW[i] = 0;
else if (m_uiBinImportance[i] == 1)
- m_uiBinCWAll[i] = m_uiCWOrgAnalyze + 1;
+ m_binCW[i] = m_initCWAnalyze + 1;
else if (m_uiBinImportance[i] == 2)
- m_uiBinCWAll[i] = m_reshapeCW.BinCW[0];
+ m_binCW[i] = m_reshapeCW.BinCW[0];
else if (m_uiBinImportance[i] == 3)
- m_uiBinCWAll[i] = m_reshapeCW.BinCW[1];
+ m_binCW[i] = m_reshapeCW.BinCW[1];
else
THROW("SDR Reshape Bin Importance not supported");
}
@@ -982,24 +1003,25 @@ void EncReshape::initLUTfromdQPModel()
{
initModelParam();
int pwlFwdLUTsize = PIC_CODE_CW_BINS;
- int pwlFwdBinLen = MAX_LUMA_RESHAPING_LUT_SIZE / PIC_CODE_CW_BINS;
- int p1 = m_DftModel.ScaleFracPrec; //=16, precision of 0.015
- int p2 = m_DftModel.OffsetFracPrec; //=1, precision of 7.5
+ int pwlFwdBinLen = m_reshapeLUTSize / PIC_CODE_CW_BINS;
+ int p1 = m_dQPModel.ScaleFracPrec; //=16, precision of 0.015
+ int p2 = m_dQPModel.OffsetFracPrec; //=1, precision of 7.5
int total_shift = p1 + p2;
- int scaleFP = (1 - 2 * m_DftModel.ScaleSign) * m_DftModel.ScaleAbs;
- int offsetFP = (1 - 2 * m_DftModel.OffsetSign) * m_DftModel.OffsetAbs;
- int maxQP = (1 - 2 * m_DftModel.MaxQPSign) * m_DftModel.MaxQPAbs;
- int minQP = (1 - 2 * m_DftModel.MinQPSign) * m_DftModel.MinQPAbs;
+ int scaleFP = (1 - 2 * m_dQPModel.ScaleSign) * m_dQPModel.ScaleAbs;
+ int offsetFP = (1 - 2 * m_dQPModel.OffsetSign) * m_dQPModel.OffsetAbs;
+ int maxQP = (1 - 2 * m_dQPModel.MaxQPSign) * m_dQPModel.MaxQPAbs;
+ int minQP = (1 - 2 * m_dQPModel.MinQPSign) * m_dQPModel.MinQPAbs;
int maxFP = maxQP * (1 << total_shift);
int minFP = minQP * (1 << total_shift);
int temp, signval, absval;
int dQPDIV6_FP;
- int32_t * SlopeLUT = new int32_t[MAX_LUMA_RESHAPING_LUT_SIZE]();
- int32_t * fLUT_HP = new int32_t[MAX_LUMA_RESHAPING_LUT_SIZE]();
+ int32_t * SlopeLUT = new int32_t[m_reshapeLUTSize]();
+ int32_t * fLUT_HP = new int32_t[m_reshapeLUTSize]();
- for (int i = 0; i < LUMA_LEVEL_TO_DQP_LUT_MAXSIZE; i++)
+ for (int i = 0; i < m_reshapeLUTSize; i++)
{
- temp = int64_t((scaleFP*i) * (1 << p2)) + int64_t(offsetFP * (1 << p1));
+ int inputY = m_lumaBD < 10 ? i << (10 - m_lumaBD) : m_lumaBD > 10 ? i >> (m_lumaBD - 10) : i;
+ temp = int64_t((scaleFP*inputY) * (1 << p2)) + int64_t(offsetFP * (1 << p1));
temp = temp > maxFP ? maxFP : temp < minFP ? minFP : temp;
signval = temp >= 0 ? 1 : -1;
absval = signval * temp;
@@ -1007,21 +1029,21 @@ void EncReshape::initLUTfromdQPModel()
SlopeLUT[i] = calcEXP2(dQPDIV6_FP);
}
- if (m_DftModel.FullRangeInputFlag == 0)
+ if (m_dQPModel.FullRangeInputFlag == 0)
{
- for (int i = 0; i < 64; i++) { SlopeLUT[i] = 0; }
- for (int i = 940; i < MAX_LUMA_RESHAPING_LUT_SIZE; i++) { SlopeLUT[i] = 0; }
+ for (int i = 0; i < (16 << (m_lumaBD - 8)); i++) { SlopeLUT[i] = 0; }
+ for (int i = (235 << (m_lumaBD - 8)); i < m_reshapeLUTSize; i++) { SlopeLUT[i] = 0; }
}
- for (int i = 0; i < MAX_LUMA_RESHAPING_LUT_SIZE - 1; i++)
+ for (int i = 0; i < m_reshapeLUTSize - 1; i++)
fLUT_HP[i + 1] = fLUT_HP[i] + SlopeLUT[i];
if (SlopeLUT != nullptr) { delete[] SlopeLUT; SlopeLUT = nullptr; }
- int max_Y = (fLUT_HP[MAX_LUMA_RESHAPING_LUT_SIZE - 1] + (1 << 7)) >> 8;
+ int max_Y = (fLUT_HP[m_reshapeLUTSize - 1] + (1 << 7)) >> 8;
int Roffset = max_Y >> 1;
- for (int i = 0; i < MAX_LUMA_RESHAPING_LUT_SIZE; i++)
+ for (int i = 0; i < m_reshapeLUTSize; i++)
{
- forwardReshapingLUT[i] = (short)(((fLUT_HP[i] >> 8) * (MAX_LUMA_RESHAPING_LUT_SIZE - 1) + Roffset) / max_Y);
+ forwardReshapingLUT[i] = (short)(((fLUT_HP[i] >> 8) * (m_reshapeLUTSize - 1) + Roffset) / max_Y);
}
if (fLUT_HP != nullptr) { delete[] fLUT_HP; fLUT_HP = nullptr; }
@@ -1031,19 +1053,19 @@ void EncReshape::initLUTfromdQPModel()
for (int i = 0; i < pwlFwdLUTsize; i++)
{
int16_t X1 = i * pwlFwdBinLen;
- m_ReshapePivot[i] = forwardReshapingLUT[X1];
+ m_reshapePivot[i] = forwardReshapingLUT[X1];
}
- m_ReshapePivot[pwlFwdLUTsize] = 1023;
+ m_reshapePivot[pwlFwdLUTsize] = ((1 << m_lumaBD) - 1);
for (int i = 0; i < pwlFwdLUTsize; i++)
{
- m_uiBinCWAll[i] = m_ReshapePivot[i + 1] - m_ReshapePivot[i];
+ m_binCW[i] = m_reshapePivot[i + 1] - m_reshapePivot[i];
}
int maxAbsDeltaCW = 0, AbsDeltaCW = 0, DeltaCW = 0;
for (int i = m_sliceReshapeInfo.reshape_model_min_bin_idx; i <= m_sliceReshapeInfo.reshape_model_max_bin_idx; i++)
{
- DeltaCW = (int)m_uiBinCWAll[i] - (int)m_uiCWOrg;
+ DeltaCW = (int)m_binCW[i] - (int)m_initCW;
m_sliceReshapeInfo.reshape_model_bin_CW_delta[i] = DeltaCW;
AbsDeltaCW = (DeltaCW < 0) ? (-DeltaCW) : DeltaCW;
if (AbsDeltaCW > maxAbsDeltaCW) { maxAbsDeltaCW = AbsDeltaCW; }
@@ -1052,18 +1074,18 @@ void EncReshape::initLUTfromdQPModel()
for (int i = 0; i < pwlFwdLUTsize; i++)
{
- int16_t Y1 = m_ReshapePivot[i];
- int16_t Y2 = m_ReshapePivot[i + 1];
- forwardReshapingLUT[i*pwlFwdBinLen] = Clip3((Pel)0, (Pel)1023, (Pel)Y1);
- int log2_pwlFwdBinLen = log2_MAX_LUMA_RESHAPING_LUT_SIZE - log2_PIC_CODE_CW_BINS;
+ int16_t Y1 = m_reshapePivot[i];
+ int16_t Y2 = m_reshapePivot[i + 1];
+ forwardReshapingLUT[i*pwlFwdBinLen] = Clip3((Pel)0, (Pel)((1 << m_lumaBD) - 1), (Pel)Y1);
+ int log2_pwlFwdBinLen = g_aucLog2[pwlFwdBinLen];
int32_t scale = ((int32_t)(Y2 - Y1) * (1 << FP_PREC) + (1 << (log2_pwlFwdBinLen - 1))) >> (log2_pwlFwdBinLen);
for (int j = 1; j < pwlFwdBinLen; j++)
{
int tempVal = Y1 + (((int32_t)scale * (int32_t)j + (1 << (FP_PREC - 1))) >> FP_PREC);
- forwardReshapingLUT[i*pwlFwdBinLen + j] = Clip3((Pel)0, (Pel)1023, (Pel)tempVal);
+ forwardReshapingLUT[i*pwlFwdBinLen + j] = Clip3((Pel)0, (Pel)((1<<m_lumaBD) -1), (Pel)tempVal);
}
}
- ReverseLUT(forwardReshapingLUT, inverseReshapingLUT, MAX_LUMA_RESHAPING_LUT_SIZE);
+ reverseLUT(forwardReshapingLUT, inverseReshapingLUT, m_reshapeLUTSize);
updateChromaDQPLUT();
}
@@ -1091,11 +1113,11 @@ int EncReshape::calcEXP2(int val)
void EncReshape::constructReshaperSDR()
{
int used_codewords;
- int tot_cw = MAX_LUMA_RESHAPING_LUT_SIZE;
+ int tot_cw = m_reshapeLUTSize;
int hist_bins = PIC_ANALYZE_CW_BINS;
- int log2_hist_lens = log2_MAX_LUMA_RESHAPING_LUT_SIZE - log2_PIC_ANALYZE_CW_BINS;
- int hist_lens = m_uiCWOrgAnalyze;
- int16_t *Y_LUT_all = new int16_t[MAX_LUMA_RESHAPING_LUT_SIZE + 1]();
+ int hist_lens = m_initCWAnalyze;
+ int log2_hist_lens = g_aucLog2[hist_lens];
+ int16_t *Y_LUT_all = new int16_t[m_reshapeLUTSize + 1]();
int i, j;
int cw_scale_bins1, cw_scale_bins2;
int max_allow_cw = tot_cw;
@@ -1105,16 +1127,16 @@ void EncReshape::constructReshaperSDR()
used_codewords = 0;
for (i = 0; i < hist_bins; i++)
- used_codewords += m_uiBinCWAll[i];
+ used_codewords += m_binCW[i];
if (used_codewords > max_allow_cw)
{
int cnt0 = 0, cnt1 = 0, cnt2 = 0;
for (i = 0; i < hist_bins; i++)
{
- if (m_uiBinCWAll[i] == hist_lens + 1) cnt0++;
- else if (m_uiBinCWAll[i] == cw_scale_bins1) cnt1++;
- else if (m_uiBinCWAll[i] == cw_scale_bins2) cnt2++;
+ if (m_binCW[i] == hist_lens + 1) cnt0++;
+ else if (m_binCW[i] == cw_scale_bins1) cnt1++;
+ else if (m_binCW[i] == cw_scale_bins2) cnt2++;
}
int delta_cw = used_codewords - max_allow_cw;
@@ -1126,9 +1148,9 @@ void EncReshape::constructReshaperSDR()
int idx = 0;
while (delta_cw > 0)
{
- if (m_uiBinCWAll[idx] > (hist_lens + 1))
+ if (m_binCW[idx] > (hist_lens + 1))
{
- m_uiBinCWAll[idx]--;
+ m_binCW[idx]--;
delta_cw--;
}
idx++;
@@ -1142,9 +1164,9 @@ void EncReshape::constructReshaperSDR()
int idx = 0;
while (delta_cw > 0)
{
- if (m_uiBinCWAll[idx] > cw_scale_bins2 && m_uiBinCWAll[idx] < cw_scale_bins1)
+ if (m_binCW[idx] > cw_scale_bins2 && m_binCW[idx] < cw_scale_bins1)
{
- m_uiBinCWAll[idx]--;
+ m_binCW[idx]--;
delta_cw--;
}
idx++;
@@ -1153,8 +1175,8 @@ void EncReshape::constructReshaperSDR()
}
for (i = 0; i < hist_bins; i++)
{
- if (m_uiBinCWAll[i] == cw_scale_bins1)
- m_uiBinCWAll[i] = hist_lens + 1;
+ if (m_binCW[i] == cw_scale_bins1)
+ m_binCW[i] = hist_lens + 1;
}
}
else if (delta_cw > (cw_reduce1 + cw_reduce2))
@@ -1163,9 +1185,9 @@ void EncReshape::constructReshaperSDR()
int idx = 0;
while (delta_cw > 0)
{
- if (m_uiBinCWAll[idx] > 0 && m_uiBinCWAll[idx] < (hist_lens + 1))
+ if (m_binCW[idx] > 0 && m_binCW[idx] < (hist_lens + 1))
{
- m_uiBinCWAll[idx]--;
+ m_binCW[idx]--;
delta_cw--;
}
idx++;
@@ -1174,23 +1196,23 @@ void EncReshape::constructReshaperSDR()
}
for (i = 0; i < hist_bins; i++)
{
- if (m_uiBinCWAll[i] == m_uiCWOrgAnalyze + 1)
- m_uiBinCWAll[i] = cw_scale_bins2;
- if (m_uiBinCWAll[i] == cw_scale_bins1)
- m_uiBinCWAll[i] = m_uiCWOrgAnalyze + 1;
+ if (m_binCW[i] == m_initCWAnalyze + 1)
+ m_binCW[i] = cw_scale_bins2;
+ if (m_binCW[i] == cw_scale_bins1)
+ m_binCW[i] = m_initCWAnalyze + 1;
}
}
}
for (int i = 0; i < PIC_CODE_CW_BINS; i++)
{
- m_uiBinCWAll[i] = m_uiBinCWAll[2 * i] + m_uiBinCWAll[2 * i + 1];
+ m_binCW[i] = m_binCW[2 * i] + m_binCW[2 * i + 1];
}
m_sliceReshapeInfo.reshape_model_min_bin_idx = 0;
m_sliceReshapeInfo.reshape_model_max_bin_idx = PIC_CODE_CW_BINS - 1;
for (int i = 0; i < PIC_CODE_CW_BINS; i++)
{
- if (m_uiBinCWAll[i] > 0)
+ if (m_binCW[i] > 0)
{
m_sliceReshapeInfo.reshape_model_min_bin_idx = i;
break;
@@ -1198,7 +1220,7 @@ void EncReshape::constructReshaperSDR()
}
for (int i = PIC_CODE_CW_BINS - 1; i >= 0; i--)
{
- if (m_uiBinCWAll[i] > 0)
+ if (m_binCW[i] > 0)
{
m_sliceReshapeInfo.reshape_model_max_bin_idx = i;
break;
@@ -1208,7 +1230,7 @@ void EncReshape::constructReshaperSDR()
int maxAbsDeltaCW = 0, AbsDeltaCW = 0, DeltaCW = 0;
for (int i = m_sliceReshapeInfo.reshape_model_min_bin_idx; i <= m_sliceReshapeInfo.reshape_model_max_bin_idx; i++)
{
- DeltaCW = (int)m_uiBinCWAll[i] - (int)m_uiCWOrg;
+ DeltaCW = (int)m_binCW[i] - (int)m_initCW;
m_sliceReshapeInfo.reshape_model_bin_CW_delta[i] = DeltaCW;
AbsDeltaCW = (DeltaCW < 0) ? (-DeltaCW) : DeltaCW;
if (AbsDeltaCW > maxAbsDeltaCW) { maxAbsDeltaCW = AbsDeltaCW; }
@@ -1216,29 +1238,29 @@ void EncReshape::constructReshaperSDR()
m_sliceReshapeInfo.maxNbitsNeededDeltaCW = g_aucLog2[maxAbsDeltaCW << 1];
hist_bins = PIC_CODE_CW_BINS;
- log2_hist_lens = log2_MAX_LUMA_RESHAPING_LUT_SIZE - log2_PIC_CODE_CW_BINS;
- hist_lens = m_uiCWOrg;
+ hist_lens = m_initCW;
+ log2_hist_lens = g_aucLog2[hist_lens];
int sum_bins = 0;
- for (i = 0; i < hist_bins; i++) { sum_bins += m_uiBinCWAll[i]; }
+ for (i = 0; i < hist_bins; i++) { sum_bins += m_binCW[i]; }
CHECK(sum_bins > max_allow_cw, "SDR CW assignment is wrong!!");
- memset(Y_LUT_all, 0, (MAX_LUMA_RESHAPING_LUT_SIZE + 1) * sizeof(int16_t));
+ memset(Y_LUT_all, 0, (m_reshapeLUTSize + 1) * sizeof(int16_t));
Y_LUT_all[0] = 0;
for (i = 0; i < hist_bins; i++)
{
- Y_LUT_all[(i + 1)*hist_lens] = Y_LUT_all[i*hist_lens] + m_uiBinCWAll[i];
+ Y_LUT_all[(i + 1)*hist_lens] = Y_LUT_all[i*hist_lens] + m_binCW[i];
int16_t Y1 = Y_LUT_all[i*hist_lens];
int16_t Y2 = Y_LUT_all[(i + 1)*hist_lens];
- m_ReshapePivot[i + 1] = Y2;
+ m_reshapePivot[i + 1] = Y2;
int32_t scale = ((int32_t)(Y2 - Y1) * (1 << FP_PREC) + (1 << (log2_hist_lens - 1))) >> (log2_hist_lens);
- forwardReshapingLUT[i*hist_lens] = Clip3((Pel)0, (Pel)1023, (Pel)Y1);
+ forwardReshapingLUT[i*hist_lens] = Clip3((Pel)0, (Pel)((1 << m_lumaBD) - 1), (Pel)Y1);
for (j = 1; j < hist_lens; j++)
{
Y_LUT_all[i*hist_lens + j] = Y1 + (((int32_t)scale * (int32_t)j + (1 << (FP_PREC - 1))) >> FP_PREC);
- forwardReshapingLUT[i*hist_lens + j] = Clip3((Pel)0, (Pel)1023, (Pel)Y_LUT_all[i*hist_lens + j]);
+ forwardReshapingLUT[i*hist_lens + j] = Clip3((Pel)0, (Pel)((1 << m_lumaBD) - 1), (Pel)Y_LUT_all[i*hist_lens + j]);
}
}
@@ -1251,7 +1273,7 @@ void EncReshape::constructReshaperSDR()
if (Y_LUT_all != nullptr) { delete[] Y_LUT_all; Y_LUT_all = nullptr; }
- ReverseLUT(forwardReshapingLUT, inverseReshapingLUT, MAX_LUMA_RESHAPING_LUT_SIZE);
+ reverseLUT(forwardReshapingLUT, inverseReshapingLUT, m_reshapeLUTSize);
updateChromaDQPLUT();
}
diff --git a/source/Lib/EncoderLib/EncReshape.h b/source/Lib/EncoderLib/EncReshape.h
index ea186506e0b5bf84bd4a2bc3d7fc84767af2eca8..5a1af35a86c80ad69016a430ece3c1e3ccee409a 100644
--- a/source/Lib/EncoderLib/EncReshape.h
+++ b/source/Lib/EncoderLib/EncReshape.h
@@ -89,18 +89,18 @@ private:
int m_tcase;
int m_rateAdpMode;
bool m_bUseAdpCW;
- uint16_t m_uiCWOrgAnalyze;
- ModelInfo m_DftModel;
+ uint16_t m_initCWAnalyze;
+ ModelInfo m_dQPModel;
ReshapeCW m_reshapeCW;
Pel m_cwLumaWeight[PIC_CODE_CW_BINS];
- double m_chromaWeight;
+ double m_chromaWeight;
int m_chromaAdj;
public:
EncReshape();
~EncReshape();
- void create_enc( int picWidth, int picHeight, uint32_t maxCUWidth, uint32_t maxCUHeight);
+ void createEnc( int picWidth, int picHeight, uint32_t maxCUWidth, uint32_t maxCUHeight, int bitDepth);
void destroy();
bool getSrcReshaped() { return m_bSrcReshaped; }
@@ -123,24 +123,24 @@ public:
void initModelParam(double dScale = 0.015, double dOffset = -7.5, int QPMax = 6, int QPMin = -3)
{
/// dQP model: dQP = clip3(QPMin, QPMax, dScale*Y+dOffset);
- m_DftModel.FullRangeInputFlag = 0;
- m_DftModel.ScaleIntPrec = 0;
- m_DftModel.ScaleFracPrec = 16;
- m_DftModel.OffsetIntPrec = 3;
- m_DftModel.OffsetFracPrec = 1;
- m_DftModel.MinMaxQPAbsPrec = 3;
- m_DftModel.ScaleSign = dScale < 0 ? 1 : 0;
- m_DftModel.ScaleAbs = unsigned((dScale < 0 ? -dScale : dScale) * (1 << m_DftModel.ScaleFracPrec));
- m_DftModel.ScaleInt = m_DftModel.ScaleAbs >> m_DftModel.ScaleFracPrec;
- m_DftModel.ScaleFrac = m_DftModel.ScaleAbs - (m_DftModel.ScaleInt << m_DftModel.ScaleFracPrec);
- m_DftModel.OffsetSign = dOffset < 0 ? 1 : 0;
- m_DftModel.OffsetAbs = unsigned((dOffset < 0 ? -dOffset : dOffset) * (1 << m_DftModel.OffsetFracPrec));
- m_DftModel.OffsetInt = m_DftModel.OffsetAbs >> m_DftModel.OffsetFracPrec;
- m_DftModel.OffsetFrac = m_DftModel.OffsetAbs - (m_DftModel.OffsetInt << m_DftModel.OffsetFracPrec);
- m_DftModel.MaxQPSign = QPMax < 0 ? 1 : 0;
- m_DftModel.MaxQPAbs = m_DftModel.MaxQPSign ? -QPMax : QPMax;
- m_DftModel.MinQPSign = QPMin < 0 ? 1 : 0;
- m_DftModel.MinQPAbs = m_DftModel.MinQPSign ? -QPMin : QPMin;
+ m_dQPModel.FullRangeInputFlag = 0;
+ m_dQPModel.ScaleIntPrec = 0;
+ m_dQPModel.ScaleFracPrec = 16;
+ m_dQPModel.OffsetIntPrec = 3;
+ m_dQPModel.OffsetFracPrec = 1;
+ m_dQPModel.MinMaxQPAbsPrec = 3;
+ m_dQPModel.ScaleSign = dScale < 0 ? 1 : 0;
+ m_dQPModel.ScaleAbs = unsigned((dScale < 0 ? -dScale : dScale) * (1 << m_dQPModel.ScaleFracPrec));
+ m_dQPModel.ScaleInt = m_dQPModel.ScaleAbs >> m_dQPModel.ScaleFracPrec;
+ m_dQPModel.ScaleFrac = m_dQPModel.ScaleAbs - (m_dQPModel.ScaleInt << m_dQPModel.ScaleFracPrec);
+ m_dQPModel.OffsetSign = dOffset < 0 ? 1 : 0;
+ m_dQPModel.OffsetAbs = unsigned((dOffset < 0 ? -dOffset : dOffset) * (1 << m_dQPModel.OffsetFracPrec));
+ m_dQPModel.OffsetInt = m_dQPModel.OffsetAbs >> m_dQPModel.OffsetFracPrec;
+ m_dQPModel.OffsetFrac = m_dQPModel.OffsetAbs - (m_dQPModel.OffsetInt << m_dQPModel.OffsetFracPrec);
+ m_dQPModel.MaxQPSign = QPMax < 0 ? 1 : 0;
+ m_dQPModel.MaxQPAbs = m_dQPModel.MaxQPSign ? -QPMax : QPMax;
+ m_dQPModel.MinQPSign = QPMin < 0 ? 1 : 0;
+ m_dQPModel.MinQPAbs = m_dQPModel.MinQPSign ? -QPMin : QPMin;
}
};// END CLASS DEFINITION EncReshape
diff --git a/source/Lib/EncoderLib/InterSearch.cpp b/source/Lib/EncoderLib/InterSearch.cpp
index 0da2c547da707663ec30583af844df4addd0dac7..60ef8b34525a4a0a0829d8571580cc289e5682eb 100644
--- a/source/Lib/EncoderLib/InterSearch.cpp
+++ b/source/Lib/EncoderLib/InterSearch.cpp
@@ -5635,7 +5635,7 @@ void InterSearch::xEstimateInterResidualQT(CodingStructure &cs, Partitioner &par
{
PelBuf resiBuf = csFull->getResiBuf(compArea);
int cScale = tu.getChromaAdj();
- resiBuf.scaleSignal(cScale, 1);
+ resiBuf.scaleSignal(cScale, 1, tu.cu->cs->slice->clpRng(compID));
}
#endif
#if JVET_M0464_UNI_MTS
@@ -5723,7 +5723,7 @@ void InterSearch::xEstimateInterResidualQT(CodingStructure &cs, Partitioner &par
if (slice.getReshapeInfo().getUseSliceReshaper() && m_pcReshape->getCTUFlag() && isChroma(compID) && slice.getReshapeInfo().getSliceReshapeChromaAdj() && tu.blocks[compID].width*tu.blocks[compID].height > 4 )
{
int cScale = tu.getChromaAdj();
- resiBuf.scaleSignal(cScale, 0);
+ resiBuf.scaleSignal(cScale, 0, tu.cu->cs->slice->clpRng(compID));
}
#endif
diff --git a/source/Lib/EncoderLib/IntraSearch.cpp b/source/Lib/EncoderLib/IntraSearch.cpp
index b0b870af712ff1b323f3f2617018d1f406f8fdf5..f206a9d5a789cf058bf8d1e70f9ae8f98c4d0de2 100644
--- a/source/Lib/EncoderLib/IntraSearch.cpp
+++ b/source/Lib/EncoderLib/IntraSearch.cpp
@@ -1378,7 +1378,7 @@ void IntraSearch::xIntraCodingTUBlock(TransformUnit &tu, const ComponentID &comp
double tmpWeight = dCScale*dCScale;
m_pcTrQuant->setLambda(m_pcTrQuant->getLambda() / tmpWeight);
- piResi.scaleSignal(tu.getChromaAdj(), 1);
+ piResi.scaleSignal(tu.getChromaAdj(), 1, tu.cu->cs->slice->clpRng(compID));
}
#endif
@@ -1411,7 +1411,7 @@ void IntraSearch::xIntraCodingTUBlock(TransformUnit &tu, const ComponentID &comp
#if JVET_M0427_INLOOP_RESHAPER
if (bFlag && uiAbsSum > 0 && isChroma(compID) && slice.getReshapeInfo().getSliceReshapeChromaAdj() )
{
- piResi.scaleSignal(tu.getChromaAdj(), 0);
+ piResi.scaleSignal(tu.getChromaAdj(), 0, tu.cu->cs->slice->clpRng(compID));
}
#endif
if (bUseCrossCPrediction)
diff --git a/source/Lib/EncoderLib/VLCWriter.cpp b/source/Lib/EncoderLib/VLCWriter.cpp
index 32a2d0735337a5ad5a78e8226dc9c3f8f3dc3bce..4a07b4fd4cf82571849fa7443607eb9c86348a28 100644
--- a/source/Lib/EncoderLib/VLCWriter.cpp
+++ b/source/Lib/EncoderLib/VLCWriter.cpp
@@ -603,17 +603,17 @@ void HLSWriter::codeReshaper(const sliceReshapeInfo& pSliceReshaperInfo, const S
WRITE_UVLC(pSliceReshaperInfo.reshape_model_min_bin_idx, "reshaper_model_min_bin_idx");
WRITE_UVLC(PIC_CODE_CW_BINS - 1 - pSliceReshaperInfo.reshape_model_max_bin_idx, "reshaper_model_max_bin_idx");
assert(pSliceReshaperInfo.maxNbitsNeededDeltaCW > 0);
- WRITE_UVLC(pSliceReshaperInfo.maxNbitsNeededDeltaCW-1, "reshaper_model_bin_delta_abs_cw_prec_minus1");
-
- for (int i = pSliceReshaperInfo.reshape_model_min_bin_idx; i <= pSliceReshaperInfo.reshape_model_max_bin_idx; i++)
- {
- int CW_delta = pSliceReshaperInfo.reshape_model_bin_CW_delta[i];
- int signCW = (CW_delta < 0) ? 1 : 0;
- int absCW = (CW_delta < 0) ? (-CW_delta) : CW_delta;
- WRITE_CODE(absCW, pSliceReshaperInfo.maxNbitsNeededDeltaCW, "reshape_model_abs_CW");
- if (absCW > 0)
- WRITE_FLAG(signCW, "reshape_model_sign_CW");
- }
+ WRITE_UVLC(pSliceReshaperInfo.maxNbitsNeededDeltaCW - 1, "reshaper_model_bin_delta_abs_cw_prec_minus1");
+
+ for (int i = pSliceReshaperInfo.reshape_model_min_bin_idx; i <= pSliceReshaperInfo.reshape_model_max_bin_idx; i++)
+ {
+ int deltaCW = pSliceReshaperInfo.reshape_model_bin_CW_delta[i];
+ int signCW = (deltaCW < 0) ? 1 : 0;
+ int absCW = (deltaCW < 0) ? (-deltaCW) : deltaCW;
+ WRITE_CODE(absCW, pSliceReshaperInfo.maxNbitsNeededDeltaCW, "reshape_model_abs_CW");
+ if (absCW > 0)
+ WRITE_FLAG(signCW, "reshape_model_sign_CW");
+ }
}
WRITE_FLAG(pSliceReshaperInfo.getUseSliceReshaper() ? 1 : 0, "slice_reshaper_enable_flag");