Commit 9c470123 authored by Karsten Suehring's avatar Karsten Suehring

remove macro JVET_L0428_DQP_SEP_TREE

parent 1a4b0ab9
...@@ -131,7 +131,6 @@ ...@@ -131,7 +131,6 @@
#endif #endif
#define JVET_L0428_DQP_SEP_TREE 1 // Delta QP for Separate Tree
// ==================================================================================================================== // ====================================================================================================================
// NEXT software switches // NEXT software switches
// ==================================================================================================================== // ====================================================================================================================
......
...@@ -575,7 +575,6 @@ bool CABACReader::coding_tree( CodingStructure& cs, Partitioner& partitioner, CU ...@@ -575,7 +575,6 @@ bool CABACReader::coding_tree( CodingStructure& cs, Partitioner& partitioner, CU
cuCtx.qp = CU::predictQP( cu, cuCtx.qp ); cuCtx.qp = CU::predictQP( cu, cuCtx.qp );
} }
#if JVET_L0428_DQP_SEP_TREE
if (pps.getUseDQP() && CS::isDualITree(cs) && isChroma(cu.chType)) if (pps.getUseDQP() && CS::isDualITree(cs) && isChroma(cu.chType))
{ {
const Position chromaCentral(cu.chromaPos().offset(cu.chromaSize().width >> 1, cu.chromaSize().height >> 1)); const Position chromaCentral(cu.chromaPos().offset(cu.chromaSize().width >> 1, cu.chromaSize().height >> 1));
...@@ -584,7 +583,6 @@ bool CABACReader::coding_tree( CodingStructure& cs, Partitioner& partitioner, CU ...@@ -584,7 +583,6 @@ bool CABACReader::coding_tree( CodingStructure& cs, Partitioner& partitioner, CU
if (colLumaCu) cuCtx.qp = colLumaCu->qp; if (colLumaCu) cuCtx.qp = colLumaCu->qp;
} }
#endif
cu.qp = cuCtx.qp; //NOTE: CU QP can be changed by deltaQP signaling at TU level cu.qp = cuCtx.qp; //NOTE: CU QP can be changed by deltaQP signaling at TU level
cu.chromaQpAdj = cs.chromaQpAdj; //NOTE: CU chroma QP adjustment can be changed by adjustment signaling at TU level cu.chromaQpAdj = cs.chromaQpAdj; //NOTE: CU chroma QP adjustment can be changed by adjustment signaling at TU level
...@@ -1959,9 +1957,7 @@ void CABACReader::transform_unit( TransformUnit& tu, CUCtx& cuCtx, ChromaCbfs& c ...@@ -1959,9 +1957,7 @@ void CABACReader::transform_unit( TransformUnit& tu, CUCtx& cuCtx, ChromaCbfs& c
{ {
if( cu.cs->pps->getUseDQP() && !cuCtx.isDQPCoded ) if( cu.cs->pps->getUseDQP() && !cuCtx.isDQPCoded )
{ {
#if JVET_L0428_DQP_SEP_TREE
if (!CS::isDualITree(*tu.cs) || isLuma(tu.chType)) if (!CS::isDualITree(*tu.cs) || isLuma(tu.chType))
#endif
{ {
cu_qp_delta(cu, cuCtx.qp, cu.qp); cu_qp_delta(cu, cuCtx.qp, cu.qp);
cuCtx.qp = cu.qp; cuCtx.qp = cu.qp;
......
...@@ -1866,9 +1866,7 @@ void CABACWriter::transform_unit( const TransformUnit& tu, CUCtx& cuCtx, ChromaC ...@@ -1866,9 +1866,7 @@ void CABACWriter::transform_unit( const TransformUnit& tu, CUCtx& cuCtx, ChromaC
{ {
if( cu.cs->pps->getUseDQP() && !cuCtx.isDQPCoded ) if( cu.cs->pps->getUseDQP() && !cuCtx.isDQPCoded )
{ {
#if JVET_L0428_DQP_SEP_TREE
if (!CS::isDualITree(*tu.cs) || isLuma(tu.chType)) if (!CS::isDualITree(*tu.cs) || isLuma(tu.chType))
#endif
{ {
cu_qp_delta(cu, cuCtx.qp, cu.qp); cu_qp_delta(cu, cuCtx.qp, cu.qp);
cuCtx.qp = cu.qp; cuCtx.qp = cu.qp;
......
...@@ -639,7 +639,6 @@ void EncCu::xCompressCU( CodingStructure *&tempCS, CodingStructure *&bestCS, Par ...@@ -639,7 +639,6 @@ void EncCu::xCompressCU( CodingStructure *&tempCS, CodingStructure *&bestCS, Par
{ {
EncTestMode currTestMode = m_modeCtrl->currTestMode(); EncTestMode currTestMode = m_modeCtrl->currTestMode();
#if JVET_L0428_DQP_SEP_TREE
if (tempCS->pps->getUseDQP() && CS::isDualITree(*tempCS) && isChroma(partitioner.chType)) if (tempCS->pps->getUseDQP() && CS::isDualITree(*tempCS) && isChroma(partitioner.chType))
{ {
const Position chromaCentral(tempCS->area.Cb().chromaPos().offset(tempCS->area.Cb().chromaSize().width >> 1, tempCS->area.Cb().chromaSize().height >> 1)); const Position chromaCentral(tempCS->area.Cb().chromaPos().offset(tempCS->area.Cb().chromaSize().width >> 1, tempCS->area.Cb().chromaSize().height >> 1));
...@@ -653,7 +652,6 @@ void EncCu::xCompressCU( CodingStructure *&tempCS, CodingStructure *&bestCS, Par ...@@ -653,7 +652,6 @@ void EncCu::xCompressCU( CodingStructure *&tempCS, CodingStructure *&bestCS, Par
currTestMode.qp = colLumaCu->qp; currTestMode.qp = colLumaCu->qp;
} }
} }
#endif
#if SHARP_LUMA_DELTA_QP #if SHARP_LUMA_DELTA_QP
if( m_pcEncCfg->getLumaLevelToDeltaQPMapping().isEnabled() && partitioner.currDepth <= pps.getMaxCuDQPDepth() ) if( m_pcEncCfg->getLumaLevelToDeltaQPMapping().isEnabled() && partitioner.currDepth <= pps.getMaxCuDQPDepth() )
...@@ -1452,12 +1450,10 @@ void EncCu::xCheckDQP( CodingStructure& cs, Partitioner& partitioner, bool bKeep ...@@ -1452,12 +1450,10 @@ void EncCu::xCheckDQP( CodingStructure& cs, Partitioner& partitioner, bool bKeep
return; return;
} }
#if JVET_L0428_DQP_SEP_TREE
if (CS::isDualITree(cs) && isChroma(partitioner.chType)) if (CS::isDualITree(cs) && isChroma(partitioner.chType))
{ {
return; return;
} }
#endif
if( bKeepCtx && partitioner.currDepth != cs.pps->getMaxCuDQPDepth() ) if( bKeepCtx && partitioner.currDepth != cs.pps->getMaxCuDQPDepth() )
{ {
......
...@@ -929,9 +929,7 @@ void EncModeCtrlMTnoRQT::initCULevel( Partitioner &partitioner, const CodingStru ...@@ -929,9 +929,7 @@ void EncModeCtrlMTnoRQT::initCULevel( Partitioner &partitioner, const CodingStru
int baseQP = cs.baseQP; int baseQP = cs.baseQP;
if( m_pcEncCfg->getUseAdaptiveQP() ) if( m_pcEncCfg->getUseAdaptiveQP() )
{ {
#if JVET_L0428_DQP_SEP_TREE
if (!CS::isDualITree(cs) || isLuma(partitioner.chType)) if (!CS::isDualITree(cs) || isLuma(partitioner.chType))
#endif
{ {
baseQP = Clip3(-cs.sps->getQpBDOffset(CHANNEL_TYPE_LUMA), MAX_QP, baseQP + xComputeDQP(cs, partitioner)); baseQP = Clip3(-cs.sps->getQpBDOffset(CHANNEL_TYPE_LUMA), MAX_QP, baseQP + xComputeDQP(cs, partitioner));
} }
......
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