Commit 00ebd693 authored by Karl Sharman's avatar Karl Sharman
Browse files

remove macro JVET_G0101_QP_SWITCHING

parent f16e6b50
......@@ -90,7 +90,6 @@
#define X0038_LAMBDA_FROM_QP_CAPABILITY 1 ///< This approach derives lambda from QP+QPoffset+QPoffset2. QPoffset2 is derived from QP+QPoffset using a linear model that is clipped between 0 and 3.
// To use this capability enable config parameter LambdaFromQpEnable
#define JVET_G0101_QP_SWITCHING 1 ///< After switching POC, increase base QP instead of frame level QP.
#define JVET_F0064_MSSSIM 1 ///< Calculate MS-SSIM scores
#define JCTVC_Y0037_XPSNR 1 ///< Enable xPSNR (Cross-Component PSNR) computation
......
......@@ -1402,14 +1402,12 @@ Int TEncCfg::getQPForPicture(const UInt gopIndex, const TComSlice *pSlice) const
qp = getBaseQP();
#if JVET_G0101_QP_SWITCHING
// modify QP if a fractional QP was originally specified, cause dQPs to be 0 or 1.
const Int* pdQPs = getdQPs();
if ( pdQPs )
{
qp += pdQPs[ pSlice->getPOC() ];
}
#endif
if(sliceType==I_SLICE)
{
......@@ -1431,14 +1429,6 @@ Int TEncCfg::getQPForPicture(const UInt gopIndex, const TComSlice *pSlice) const
}
}
#if !JVET_G0101_QP_SWITCHING
// modify QP if a fractional QP was originally specified, cause dQPs to be 0 or 1.
const Int* pdQPs = getdQPs();
if ( pdQPs )
{
qp += pdQPs[ pSlice->getPOC() ];
}
#endif
}
qp = Clip3( -lumaQpBDOffset, MAX_QP, qp );
return qp;
......
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