From 73c490cf6569120420d3736445f1cea55559be16 Mon Sep 17 00:00:00 2001 From: delagrangep <philippe.delagrange@interdigital.com> Date: Mon, 15 Mar 2021 17:53:43 +0100 Subject: [PATCH] Fix bad bitstream generation: wrong parameter to rpcSlice->setUseChromaQpAdj() in initEncSlice(). --- source/App/EncoderApp/EncApp.cpp | 2 +- source/Lib/EncoderLib/EncSlice.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/source/App/EncoderApp/EncApp.cpp b/source/App/EncoderApp/EncApp.cpp index f6f3a0ea6..e9a2ca876 100644 --- a/source/App/EncoderApp/EncApp.cpp +++ b/source/App/EncoderApp/EncApp.cpp @@ -589,7 +589,7 @@ void EncApp::xInitLibCfg() m_cEncLib.setCuQpDeltaSubdiv ( m_cuQpDeltaSubdiv ); m_cEncLib.setCuChromaQpOffsetSubdiv ( m_cuChromaQpOffsetSubdiv ); m_cEncLib.setCuChromaQpOffsetList ( m_cuChromaQpOffsetList ); - m_cEncLib.setCuChromaQpOffsetEnabled ( m_cuChromaQpOffsetEnabled && m_cuChromaQpOffsetList.size() > 0 ); + m_cEncLib.setCuChromaQpOffsetEnabled ( m_cuChromaQpOffsetEnabled ); m_cEncLib.setChromaCbQpOffset ( m_cbQpOffset ); m_cEncLib.setChromaCrQpOffset ( m_crQpOffset ); m_cEncLib.setChromaCbQpOffsetDualTree ( m_cbQpOffsetDualTree ); diff --git a/source/Lib/EncoderLib/EncSlice.cpp b/source/Lib/EncoderLib/EncSlice.cpp index 637c50754..c5a834a31 100644 --- a/source/Lib/EncoderLib/EncSlice.cpp +++ b/source/Lib/EncoderLib/EncSlice.cpp @@ -628,7 +628,7 @@ void EncSlice::initEncSlice(Picture* pcPic, const int pocLast, const int pocCurr rpcSlice->setSliceChromaQpDelta( COMPONENT_Cr, 0 ); rpcSlice->setSliceChromaQpDelta( JOINT_CbCr, 0 ); #endif - rpcSlice->setUseChromaQpAdj( m_pcCfg->getCuChromaQpOffsetEnabled() ); + rpcSlice->setUseChromaQpAdj( rpcSlice->getPPS()->getCuChromaQpOffsetListEnabledFlag() && m_pcCfg->getCuChromaQpOffsetEnabled() ); rpcSlice->setNumRefIdx(REF_PIC_LIST_0, m_pcCfg->getRPLEntry(0, iGOPid).m_numRefPicsActive); rpcSlice->setNumRefIdx(REF_PIC_LIST_1, m_pcCfg->getRPLEntry(1, iGOPid).m_numRefPicsActive); -- GitLab