diff --git a/source/App/EncoderApp/EncAppCfg.cpp b/source/App/EncoderApp/EncAppCfg.cpp index 6dbba42daee14ec2c594b378e5f583c5c78bf5e7..bfa4d4a9652476d69c6a9dcd2a2045b795e71241 100644 --- a/source/App/EncoderApp/EncAppCfg.cpp +++ b/source/App/EncoderApp/EncAppCfg.cpp @@ -2205,12 +2205,10 @@ bool EncAppCfg::parseCfg( int argc, char* argv[] ) #endif #endif // ENABLE_QPA -#if JVET_AHG14_LOSSLESS_ENC_QP_FIX if( m_costMode == COST_LOSSLESS_CODING ) { m_iQP = LOSSLESS_AND_MIXED_LOSSLESS_RD_COST_TEST_QP - ( ( m_internalBitDepth[CHANNEL_TYPE_LUMA] - 8 ) * 6 ); } -#endif m_uiMaxCUWidth = m_uiMaxCUHeight = m_uiCTUSize; diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h index 608e9e19cd17024bd990295915d5985af4c288c8..7cc46ed4ce49086a2916e3b90cfdc1a9e4593791 100644 --- a/source/Lib/CommonLib/TypeDef.h +++ b/source/Lib/CommonLib/TypeDef.h @@ -156,7 +156,6 @@ -#define JVET_AHG14_LOSSLESS_ENC_QP_FIX 1 && JVET_AHG14_LOSSLESS #define JVET_M0497_MATRIX_MULT 0 // 0: Fast method; 1: Matrix multiplication diff --git a/source/Lib/EncoderLib/EncLib.cpp b/source/Lib/EncoderLib/EncLib.cpp index 5d63f73993bac4932b833e0ba5fdda453cdbd680..9d190f1adba43fc14f63826c65576e02350904c8 100644 --- a/source/Lib/EncoderLib/EncLib.cpp +++ b/source/Lib/EncoderLib/EncLib.cpp @@ -2105,11 +2105,7 @@ int EncCfg::getQPForPicture(const uint32_t gopIndex, const Slice *pSlice) const if (getCostMode()==COST_LOSSLESS_CODING) { -#if JVET_AHG14_LOSSLESS_ENC_QP_FIX qp = getBaseQP(); -#else - qp = LOSSLESS_AND_MIXED_LOSSLESS_RD_COST_TEST_QP - ( ( pSlice->getSPS()->getBitDepth( CHANNEL_TYPE_LUMA ) - 8 ) * 6 ); -#endif } else {