Skip to content
Snippets Groups Projects
Commit a22430c0 authored by Muhammed Coban's avatar Muhammed Coban
Browse files

R0083 fix addressing ticket #859 for Q0089 related DQ and TS interaction issue.

parent 2275adb3
No related branches found
No related tags found
1 merge request!1543JVET-R0083: Fix addressing ticket #859 for Q0089 related DQ and TS interaction issue.
...@@ -1573,7 +1573,7 @@ DepQuant::~DepQuant() ...@@ -1573,7 +1573,7 @@ DepQuant::~DepQuant()
void DepQuant::quant( TransformUnit &tu, const ComponentID &compID, const CCoeffBuf &pSrc, TCoeff &uiAbsSum, const QpParam &cQP, const Ctx& ctx ) void DepQuant::quant( TransformUnit &tu, const ComponentID &compID, const CCoeffBuf &pSrc, TCoeff &uiAbsSum, const QpParam &cQP, const Ctx& ctx )
{ {
if ( tu.cs->picHeader->getDepQuantEnabledFlag() && (tu.mtsIdx[compID] != MTS_SKIP) ) if(tu.cs->picHeader->getDepQuantEnabledFlag() && (tu.cu->slice->getTSResidualCodingDisabledFlag() || (tu.mtsIdx[compID] != MTS_SKIP)) )
{ {
//===== scaling matrix ==== //===== scaling matrix ====
const int qpDQ = cQP.Qp(tu.mtsIdx[compID] == MTS_SKIP) + 1; const int qpDQ = cQP.Qp(tu.mtsIdx[compID] == MTS_SKIP) + 1;
...@@ -1599,7 +1599,7 @@ void DepQuant::quant( TransformUnit &tu, const ComponentID &compID, const CCoeff ...@@ -1599,7 +1599,7 @@ void DepQuant::quant( TransformUnit &tu, const ComponentID &compID, const CCoeff
void DepQuant::dequant( const TransformUnit &tu, CoeffBuf &dstCoeff, const ComponentID &compID, const QpParam &cQP ) void DepQuant::dequant( const TransformUnit &tu, CoeffBuf &dstCoeff, const ComponentID &compID, const QpParam &cQP )
{ {
if( tu.cs->picHeader->getDepQuantEnabledFlag() && (tu.mtsIdx[compID] != MTS_SKIP)) if( tu.cs->picHeader->getDepQuantEnabledFlag() && (tu.cu->slice->getTSResidualCodingDisabledFlag() || (tu.mtsIdx[compID] != MTS_SKIP)) )
{ {
const int qpDQ = cQP.Qp(tu.mtsIdx[compID] == MTS_SKIP) + 1; const int qpDQ = cQP.Qp(tu.mtsIdx[compID] == MTS_SKIP) + 1;
const int qpPer = qpDQ / 6; const int qpPer = qpDQ / 6;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment