Commit 312dfad6 authored by Frank Bossen's avatar Frank Bossen

Merge branch 'R0083-SW-Cleanup' into 'master'

JVET-R0083: Fix addressing ticket #859 for Q0089 related DQ and TS interaction issue.

See merge request jvet/VVCSoftware_VTM!1543
parents c14437d3 d43ee019
......@@ -1573,10 +1573,11 @@ DepQuant::~DepQuant()
void DepQuant::quant( TransformUnit &tu, const ComponentID &compID, const CCoeffBuf &pSrc, TCoeff &uiAbsSum, const QpParam &cQP, const Ctx& ctx )
{
const bool useRegularResidualCoding = tu.cu->slice->getTSResidualCodingDisabledFlag() || tu.mtsIdx[compID] != MTS_SKIP;
#if JVET_R0271_SLICE_LEVEL_DQ_SDH_RRC
if ( tu.cs->slice->getDepQuantEnabledFlag() && (tu.mtsIdx[compID] != MTS_SKIP) )
if( tu.cs->slice->getDepQuantEnabledFlag() && useRegularResidualCoding )
#else
if ( tu.cs->picHeader->getDepQuantEnabledFlag() && (tu.mtsIdx[compID] != MTS_SKIP) )
if( tu.cs->picHeader->getDepQuantEnabledFlag() && useRegularResidualCoding )
#endif
{
//===== scaling matrix ====
......@@ -1603,10 +1604,11 @@ void DepQuant::quant( TransformUnit &tu, const ComponentID &compID, const CCoeff
void DepQuant::dequant( const TransformUnit &tu, CoeffBuf &dstCoeff, const ComponentID &compID, const QpParam &cQP )
{
const bool useRegularResidualCoding = tu.cu->slice->getTSResidualCodingDisabledFlag() || tu.mtsIdx[compID] != MTS_SKIP;
#if JVET_R0271_SLICE_LEVEL_DQ_SDH_RRC
if( tu.cs->slice->getDepQuantEnabledFlag() && (tu.mtsIdx[compID] != MTS_SKIP) )
if( tu.cs->slice->getDepQuantEnabledFlag() && useRegularResidualCoding )
#else
if( tu.cs->picHeader->getDepQuantEnabledFlag() && (tu.mtsIdx[compID] != MTS_SKIP))
if( tu.cs->picHeader->getDepQuantEnabledFlag() && useRegularResidualCoding )
#endif
{
const int qpDQ = cQP.Qp(tu.mtsIdx[compID] == MTS_SKIP) + 1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment