diff --git a/source/Lib/CommonLib/DepQuant.cpp b/source/Lib/CommonLib/DepQuant.cpp
index 96bf315e..a746767b 100644
a
|
b
|
DepQuant::~DepQuant() |
1573 | 1573 | |
1574 | 1574 | void DepQuant::quant( TransformUnit &tu, const ComponentID &compID, const CCoeffBuf &pSrc, TCoeff &uiAbsSum, const QpParam &cQP, const Ctx& ctx ) |
1575 | 1575 | { |
| 1576 | #if JVET_Q0089_SLICE_LOSSLESS_CODING_CHROMA_BDPCM |
| 1577 | if ( tu.cs->picHeader->getDepQuantEnabledFlag() && !(tu.mtsIdx[compID] == MTS_SKIP && !tu.cs->slice->getTSResidualCodingDisabledFlag())) |
| 1578 | #else |
1576 | 1579 | if ( tu.cs->picHeader->getDepQuantEnabledFlag() && (tu.mtsIdx[compID] != MTS_SKIP) ) |
| 1580 | #endif |
1577 | 1581 | { |
1578 | 1582 | //===== scaling matrix ==== |
1579 | 1583 | const int qpDQ = cQP.Qp(tu.mtsIdx[compID] == MTS_SKIP) + 1; |
… |
… |
void DepQuant::quant( TransformUnit &tu, const ComponentID &compID, const CCoeff |
1603 | 1607 | |
1604 | 1608 | void DepQuant::dequant( const TransformUnit &tu, CoeffBuf &dstCoeff, const ComponentID &compID, const QpParam &cQP ) |
1605 | 1609 | { |
| 1610 | #if JVET_Q0089_SLICE_LOSSLESS_CODING_CHROMA_BDPCM |
| 1611 | if( tu.cs->picHeader->getDepQuantEnabledFlag() && !(tu.mtsIdx[compID] == MTS_SKIP && !tu.cs->slice->getTSResidualCodingDisabledFlag())) |
| 1612 | #else |
1606 | 1613 | if( tu.cs->picHeader->getDepQuantEnabledFlag() && (tu.mtsIdx[compID] != MTS_SKIP)) |
| 1614 | #endif |
1607 | 1615 | { |
1608 | 1616 | const int qpDQ = cQP.Qp(tu.mtsIdx[compID] == MTS_SKIP) + 1; |
1609 | 1617 | const int qpPer = qpDQ / 6; |
diff --git a/source/Lib/CommonLib/QuantRDOQ.cpp b/source/Lib/CommonLib/QuantRDOQ.cpp
index a258d766..e88e6893 100644
a
|
b
|
void QuantRDOQ::quant(TransformUnit &tu, const ComponentID &compID, const CCoeff |
541 | 541 | } |
542 | 542 | else |
543 | 543 | { |
| 544 | #if JVET_Q0089_SLICE_LOSSLESS_CODING_CHROMA_BDPCM |
| 545 | if (tu.cs->slice->getTSResidualCodingDisabledFlag()) |
| 546 | { |
| 547 | xRateDistOptQuant( tu, compID, pSrc, uiAbsSum, cQP, ctx ); |
| 548 | } |
| 549 | else |
| 550 | { |
| 551 | xRateDistOptQuantTS( tu, compID, pSrc, uiAbsSum, cQP, ctx ); |
| 552 | } |
| 553 | #else |
544 | 554 | xRateDistOptQuantTS( tu, compID, pSrc, uiAbsSum, cQP, ctx ); |
| 555 | #endif |
545 | 556 | } |
546 | 557 | } |
547 | 558 | else |