From 406f43067ec331e0a88554c3945a9421f53e93cf Mon Sep 17 00:00:00 2001
From: Adarsh Krishnan Ramasubramonian <aramasub@qti.qualcomm.com>
Date: Thu, 1 Aug 2019 14:47:01 +0100
Subject: [PATCH] More fixes.
---
source/App/EncoderApp/EncAppCfg.cpp | 6 ++----
source/Lib/CommonLib/Quant.cpp | 2 +-
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/source/App/EncoderApp/EncAppCfg.cpp b/source/App/EncoderApp/EncAppCfg.cpp
index 170a940c9..d4be2f88c 100644
--- a/source/App/EncoderApp/EncAppCfg.cpp
+++ b/source/App/EncoderApp/EncAppCfg.cpp
@@ -715,10 +715,8 @@ bool EncAppCfg::parseCfg( int argc, char* argv[] )
uint32_t lumaLevelToDeltaQPMode;
#endif
#if JVET_O0650_SIGNAL_CHROMAQP_MAPPING_TABLE
- //const int qpInVals[] = { 25, 33, 43 }; // Without incorporating CQP offset of 1
- //const int qpOutVals[] = { 25, 32, 37 }; // Without incorporating CQP offset of 1
- const int qpInVals[] = { 8, 25, 33, 43 };
- const int qpOutVals[] = { 8, 26, 33, 38 };
+ const int qpInVals[] = { 25, 33, 43 };
+ const int qpOutVals[] = { 25, 32, 37 };
SMultiValueInput<int> cfg_qpInValCb(-48, 63, 0, 112, qpInVals, sizeof(qpInVals)/sizeof(int));
SMultiValueInput<int> cfg_qpOutValCb(-48, 63, 0, 112, qpOutVals, sizeof(qpOutVals) / sizeof(int));
const int zeroVector[] = { 0 };
diff --git a/source/Lib/CommonLib/Quant.cpp b/source/Lib/CommonLib/Quant.cpp
index f6cbab853..dce99ed74 100644
--- a/source/Lib/CommonLib/Quant.cpp
+++ b/source/Lib/CommonLib/Quant.cpp
@@ -174,7 +174,7 @@ QpParam::QpParam(const TransformUnit& tu, const ComponentID &compIDX, const int
#if JVET_O0105_ICT
const bool useJQP = isChroma(compID) && (abs(TU::getICTMode(tu)) == 2);
#else
- const bool useJQP = tu.jointCbCr;
+ 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)), chromaQpOffset, tu.chromaFormat, dqp, tu.cs->sps);
#else
--
GitLab