Commit bea688a0 authored by Karsten Suehring's avatar Karsten Suehring
Browse files

Apply patch for JVET-E0059/JVET-G0101: calculation of QP adjustment for second part of sequence


Patch-by: Philippe Hanhart's avatarHanhart, Philippe <Philippe.Hanhart@InterDigital.com>
parent aa1c12c1
......@@ -85,6 +85,7 @@
#define JCTVC_Y0038_PARAMS 1
#define JVET_E0059_FLOATING_POINT_QP_FIX 1 ///< Replace floating point QP with a source-file frame number.
#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
......
......@@ -1413,6 +1413,15 @@ 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)
{
qp += getIntraQPOffset();
......@@ -1433,12 +1442,14 @@ 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