Skip to content
Snippets Groups Projects

JVET-R0045: cleaup for signalling minQP for transform skip

Merged LI JINGYA requested to merge lijingya/VVCSoftware_VTM:master into master
All threads resolved!
@@ -66,7 +66,7 @@ QpParam::QpParam(const int qpy,
const ComponentID compID,
const int qpBdOffset,
#if JVET_R0045_TS_MIN_QP_CLEANUP
const int interalMinusInputBitDepth,
const int internalMinusInputBitDepth,
#else
const int minQpPrimeTsMinus4,
#endif
@@ -101,7 +101,7 @@ QpParam::QpParam(const int qpy,
int baseQpTS = baseQp;
#if JVET_R0045_TS_MIN_QP_CLEANUP
baseQpTS = std::max(baseQpTS, 4 + 6 * interalMinusInputBitDepth);
baseQpTS = std::max(baseQpTS, 4 + 6 * internalMinusInputBitDepth);
#else
baseQpTS = std::max(baseQpTS, 4 + minQpPrimeTsMinus4);
#endif
@@ -131,7 +131,7 @@ QpParam::QpParam(const TransformUnit& tu, const ComponentID &compIDX, const int
const bool useJQP = isChroma(compID) && (abs(TU::getICTMode(tu)) == 2);
bool applyACTQpoffset = tu.cu->colorTransform && allowACTQpoffset;
#if JVET_R0045_TS_MIN_QP_CLEANUP
*this = QpParam(QP <= -MAX_INT ? tu.cu->qp : QP, useJQP ? JOINT_CbCr : compID, tu.cs->sps->getQpBDOffset(toChannelType(compID)), tu.cs->sps->getInteralMinusInputBitDepth(toChannelType(compID)), chromaQpOffset, tu.chromaFormat, dqp, tu.cs->sps, applyACTQpoffset);
*this = QpParam(QP <= -MAX_INT ? tu.cu->qp : QP, useJQP ? JOINT_CbCr : compID, tu.cs->sps->getQpBDOffset(toChannelType(compID)), tu.cs->sps->getInternalMinusInputBitDepth(toChannelType(compID)), chromaQpOffset, tu.chromaFormat, dqp, tu.cs->sps, applyACTQpoffset);
#else
*this = QpParam(QP <= -MAX_INT ? tu.cu->qp : QP, useJQP ? JOINT_CbCr : compID, tu.cs->sps->getQpBDOffset(toChannelType(compID)), tu.cs->sps->getMinQpPrimeTsMinus4(toChannelType(compID)), chromaQpOffset, tu.chromaFormat, dqp, tu.cs->sps, applyACTQpoffset);
#endif
Loading