diff --git a/source/Lib/CommonLib/QuantRDOQ.cpp b/source/Lib/CommonLib/QuantRDOQ.cpp
index c57ca73d774a00f8fddf6de3747b48ab7b9c111c..760f28d3935c65d6a133dc2b72facef0ad9d54b5 100644
--- a/source/Lib/CommonLib/QuantRDOQ.cpp
+++ b/source/Lib/CommonLib/QuantRDOQ.cpp
@@ -1324,7 +1324,7 @@ void QuantRDOQ::xRateDistOptQuantTS( TransformUnit &tu, const ComponentID &compI
goRiceParam = cctx.templateAbsSumTS( scanPos, dstCoeff );
if (tu.cu->slice->getSPS()->getSpsRangeExtension().getTSRCRicePresentFlag() && tu.mtsIdx[compID] == MTS_SKIP)
{
- goRiceParam = goRiceParam + tu.cu->slice->get_tsrc_index();
+ goRiceParam = goRiceParam + tu.cu->slice->getTsrcIndex();
}
unsigned ctxIdSign = cctx.signCtxIdAbsTS(scanPos, dstCoeff, 0);
const BinFracBits fracBitsSign = fracBits.getFracBitsArray(ctxIdSign);
@@ -1547,7 +1547,7 @@ void QuantRDOQ::forwardBDPCM(TransformUnit &tu, const ComponentID &compID, const
goRiceParam = cctx.templateAbsSumTS(scanPos, dstCoeff);
if (tu.cu->slice->getSPS()->getSpsRangeExtension().getTSRCRicePresentFlag() && tu.mtsIdx[compID] == MTS_SKIP)
{
- goRiceParam = goRiceParam + tu.cu->slice->get_tsrc_index();
+ goRiceParam = goRiceParam + tu.cu->slice->getTsrcIndex();
}
unsigned ctxIdSign = cctx.signCtxIdAbsTS(scanPos, dstCoeff, dirMode);
const BinFracBits fracBitsSign = fracBits.getFracBitsArray(ctxIdSign);
diff --git a/source/Lib/CommonLib/Slice.cpp b/source/Lib/CommonLib/Slice.cpp
index ab64fa483fb9df1bb95f49891e552b6adced33c4..983d2f8bb0f2c2006f12944f92ea480c480ab940 100644
--- a/source/Lib/CommonLib/Slice.cpp
+++ b/source/Lib/CommonLib/Slice.cpp
@@ -104,7 +104,6 @@ Slice::Slice()
, m_encCABACTableIdx(I_SLICE)
, m_iProcessingStartTime(0)
, m_dProcessingTime(0)
- , m_tsrc_index(0)
{
for (uint32_t i = 0; i < MAX_TSRC_RICE; i++)
{
@@ -914,7 +913,7 @@ void Slice::copySliceInfo(Slice *pSrc, bool cpyAlmostAll)
m_depQuantEnabledFlag = pSrc->m_depQuantEnabledFlag;
m_signDataHidingEnabledFlag = pSrc->m_signDataHidingEnabledFlag;
m_tsResidualCodingDisabledFlag = pSrc->m_tsResidualCodingDisabledFlag;
- m_tsrc_index = pSrc->m_tsrc_index;
+ m_tsrcIndex = pSrc->m_tsrcIndex;
for (i = 0; i < MAX_TSRC_RICE; i++)
{
diff --git a/source/Lib/CommonLib/Slice.h b/source/Lib/CommonLib/Slice.h
index fed0051080491a9b46bc2b4c65ce8b00b46e2398..57bc279b9a65c5a043f4493e9c84cf6a539f42d2 100644
--- a/source/Lib/CommonLib/Slice.h
+++ b/source/Lib/CommonLib/Slice.h
@@ -2801,7 +2801,7 @@ private:
int m_ccAlfCrApsId;
bool m_disableSATDForRd{ false };
bool m_isLossless{ false };
- int m_tsrc_index;
+ int m_tsrcIndex{ 0 };
unsigned m_riceBit[8];
int m_cntRightBottom;
@@ -3148,8 +3148,16 @@ public:
CcAlfFilterParam m_ccAlfFilterParam;
uint8_t* m_ccAlfFilterControl[2];
- void set_tsrc_index(int v) { m_tsrc_index = v; }
- int get_tsrc_index() const { return m_tsrc_index; }
+
+ void setTsrcIndex(int v)
+ {
+ m_tsrcIndex = v;
+ }
+ int getTsrcIndex() const
+ {
+ return m_tsrcIndex;
+ }
+
void setRiceBit(int idx, int i) { m_riceBit[idx] = i; }
unsigned getRiceBit(int idx) const { return m_riceBit[idx]; }
diff --git a/source/Lib/DecoderLib/CABACReader.cpp b/source/Lib/DecoderLib/CABACReader.cpp
index 50972faf9e7a7d15b8789b102f024360bc9b306b..33b3b59b3e277d4e854568acf3f9ad8268a99d83 100644
--- a/source/Lib/DecoderLib/CABACReader.cpp
+++ b/source/Lib/DecoderLib/CABACReader.cpp
@@ -3405,7 +3405,7 @@ void CABACReader::residual_codingTS( TransformUnit& tu, ComponentID compID )
int goRiceParam = 1;
if (tu.cu->slice->getSPS()->getSpsRangeExtension().getTSRCRicePresentFlag() && tu.mtsIdx[compID] == MTS_SKIP)
{
- goRiceParam = goRiceParam + tu.cu->slice->get_tsrc_index();
+ goRiceParam = goRiceParam + tu.cu->slice->getTsrcIndex();
}
residual_coding_subblockTS( cctx, coeff, goRiceParam);
}
diff --git a/source/Lib/DecoderLib/VLCReader.cpp b/source/Lib/DecoderLib/VLCReader.cpp
index b63f3902eb36a3827ebbe46465e4a186e3af1b3e..18c389724da6604aa7dd404afe590e5d96794b1b 100644
--- a/source/Lib/DecoderLib/VLCReader.cpp
+++ b/source/Lib/DecoderLib/VLCReader.cpp
@@ -4399,7 +4399,7 @@ void HLSyntaxReader::parseSliceHeader (Slice* pcSlice, PicHeader* picHeader, Par
if ((!pcSlice->getTSResidualCodingDisabledFlag()) && sps->getSpsRangeExtension().getTSRCRicePresentFlag())
{
READ_CODE(3, uiCode, "sh_ts_residual_coding_rice_idx_minus1");
- pcSlice->set_tsrc_index(uiCode);
+ pcSlice->setTsrcIndex(uiCode);
}
if (sps->getSpsRangeExtension().getReverseLastSigCoeffEnabledFlag())
{
diff --git a/source/Lib/EncoderLib/CABACWriter.cpp b/source/Lib/EncoderLib/CABACWriter.cpp
index 51e43247081daf893fb97b7181109fb2e61dcdb3..44cd3e89346a036ed7073c60f8cf2d585515de0a 100644
--- a/source/Lib/EncoderLib/CABACWriter.cpp
+++ b/source/Lib/EncoderLib/CABACWriter.cpp
@@ -3106,7 +3106,7 @@ void CABACWriter::residual_codingTS( const TransformUnit& tu, ComponentID compID
unsigned RiceBit[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
if (tu.cu->slice->getSPS()->getSpsRangeExtension().getTSRCRicePresentFlag() && tu.mtsIdx[compID] == MTS_SKIP)
{
- goRiceParam = goRiceParam + tu.cu->slice->get_tsrc_index();
+ goRiceParam = goRiceParam + tu.cu->slice->getTsrcIndex();
if (isEncoding())
{
ricePresentFlag = true;
diff --git a/source/Lib/EncoderLib/EncGOP.cpp b/source/Lib/EncoderLib/EncGOP.cpp
index ea580460c64ddf98207314dc23cb9cd78c78aa40..e76cc5c499d64b296f666484e80cf7e39001b723 100644
--- a/source/Lib/EncoderLib/EncGOP.cpp
+++ b/source/Lib/EncoderLib/EncGOP.cpp
@@ -2240,7 +2240,7 @@ void EncGOP::computeSignalling(Picture* pcPic, Slice* pcSlice) const
{
tsrcIndex = std::min(tsrcIndex, std::max(0, pcPic->cs->sps->getBitDepth(CHANNEL_TYPE_LUMA) - 9));
}
- pcSlice->set_tsrc_index(tsrcIndex);
+ pcSlice->setTsrcIndex(tsrcIndex);
}
}
}
@@ -3241,7 +3241,7 @@ void EncGOP::compressGOP(int pocLast, int numPicRcvd, PicList &rcListPic, std::l
if (m_preQP[0] != pcSlice->getSliceQp())
{
- m_riceBit[pcSlice->get_tsrc_index()][0] = (int) (m_riceBit[pcSlice->get_tsrc_index()][0] * 9 / 10);
+ m_riceBit[pcSlice->getTsrcIndex()][0] = (int) (m_riceBit[pcSlice->getTsrcIndex()][0] * 9 / 10);
}
for (int idx = 2; idx < 9; idx++)
@@ -3257,7 +3257,7 @@ void EncGOP::compressGOP(int pocLast, int numPicRcvd, PicList &rcListPic, std::l
m_riceBit[idx - 2][0] = 0;
}
m_riceBit[7][0] = 0;
- pcSlice->set_tsrc_index(nextRice - 1);
+ pcSlice->setTsrcIndex(nextRice - 1);
}
else
{
diff --git a/source/Lib/EncoderLib/EncSlice.cpp b/source/Lib/EncoderLib/EncSlice.cpp
index 5bd4afce8a0bfd8b19fcd07708d743935a123f74..62fdc3322a111e3c60054967ffda039efed8a403 100644
--- a/source/Lib/EncoderLib/EncSlice.cpp
+++ b/source/Lib/EncoderLib/EncSlice.cpp
@@ -616,7 +616,7 @@ void EncSlice::initEncSlice(Picture *pcPic, const int pocLast, const int pocCurr
pcPic->setLossyQPValue(qp);
if ((!rpcSlice->getTSResidualCodingDisabledFlag()) && ( rpcSlice->getSPS()->getSpsRangeExtension().getTSRCRicePresentFlag() ))
{
- rpcSlice->set_tsrc_index(Clip3(MIN_TSRC_RICE, MAX_TSRC_RICE, (int) ((19 - qp) / 6)) - 1);
+ rpcSlice->setTsrcIndex(Clip3(MIN_TSRC_RICE, MAX_TSRC_RICE, (int) ((19 - qp) / 6)) - 1);
}
#if !W0038_CQP_ADJ
rpcSlice->setSliceChromaQpDelta( COMPONENT_Cb, 0 );
@@ -1647,7 +1647,9 @@ void EncSlice::encodeCtus( Picture* pcPic, const bool bCompressEntireSlice, cons
int hashBlkHitPerc = m_pcCuEncoder->getIbcHashMap().calHashBlkMatchPerc(cs.area.Y());
cs.slice->setDisableSATDForRD(hashBlkHitPerc > 59);
}
- if ((pcSlice->getSPS()->getSpsRangeExtension().getTSRCRicePresentFlag()) && (m_pcGOPEncoder->getPreQP() != pcSlice->getSliceQp()) && (pcPic->cs->pps->getNumSlicesInPic() == 1) && (pcSlice->get_tsrc_index() > 0) && (pcSlice->getSPS()->getBitDepth(CHANNEL_TYPE_LUMA) <= 12))
+ if ((pcSlice->getSPS()->getSpsRangeExtension().getTSRCRicePresentFlag())
+ && (m_pcGOPEncoder->getPreQP() != pcSlice->getSliceQp()) && (pcPic->cs->pps->getNumSlicesInPic() == 1)
+ && (pcSlice->getTsrcIndex() > 0) && (pcSlice->getSPS()->getBitDepth(CHANNEL_TYPE_LUMA) <= 12))
{
uint32_t totalCtu = 0;
uint32_t hashRatio = 0;
@@ -1666,7 +1668,7 @@ void EncSlice::encodeCtus( Picture* pcPic, const bool bCompressEntireSlice, cons
{
if ((hashRatio < 4200) || (hashRatio < (41 * totalCtu)))
{
- pcSlice->set_tsrc_index(0);
+ pcSlice->setTsrcIndex(0);
}
}
}
diff --git a/source/Lib/EncoderLib/VLCWriter.cpp b/source/Lib/EncoderLib/VLCWriter.cpp
index 8926059c1021ea123d53ef84768c0e4d87162dea..6330f6c8099e1507b5acdb2c4ca117dd1e8d60ef 100644
--- a/source/Lib/EncoderLib/VLCWriter.cpp
+++ b/source/Lib/EncoderLib/VLCWriter.cpp
@@ -2633,7 +2633,7 @@ void HLSWriter::codeSliceHeader ( Slice* pcSlice, PicHeader *picHeader )
if ((!pcSlice->getTSResidualCodingDisabledFlag()) && (pcSlice->getSPS()->getSpsRangeExtension().getTSRCRicePresentFlag()))
{
- WRITE_CODE(pcSlice->get_tsrc_index(), 3, "sh_ts_residual_coding_rice_idx_minus1");
+ WRITE_CODE(pcSlice->getTsrcIndex(), 3, "sh_ts_residual_coding_rice_idx_minus1");
}
if (pcSlice->getSPS()->getSpsRangeExtension().getReverseLastSigCoeffEnabledFlag())
{