Merge branch 'fix-443' into 'master'

Fix #443: Fix to the merged version of JVET-O0919 and JVET-O0650 to use joint Cb-Cr table

See merge request !834

source/Lib/CommonLib/Quant.cpp

@@ -168,7 +168,12 @@ QpParam::QpParam(const TransformUnit& tu, const ComponentID &compIDX, const int
 
 #if JVET_O0919_TS_MIN_QP
 #if JVET_O0650_SIGNAL_CHROMAQP_MAPPING_TABLE
-  *this = QpParam(QP <= -MAX_INT ? tu.cu->qp : QP, compID, tu.cs->sps->getQpBDOffset(toChannelType(compID)), tu.cs->sps->getMinQpPrimeTsMinus4(toChannelType(compID)), chromaQpOffset, tu.chromaFormat, dqp, tu.cs->sps);
+#if JVET_O0105_ICT
+  const bool useJQP = isChroma(compID) && (abs(TU::getICTMode(tu)) == 2);
+#else
+  const bool useJQP = isChroma(compID) && tu.jointCbCr;
+#endif
+  *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);
 #else
   *this = QpParam(QP <= -MAX_INT ? tu.cu->qp : QP, toChannelType(compID), tu.cs->sps->getQpBDOffset(toChannelType(compID)), tu.cs->sps->getMinQpPrimeTsMinus4(toChannelType(compID)), chromaQpOffset, tu.chromaFormat, dqp);
 #endif