Skip to content

GitLab

V
VVCSoftware_BMS
Commit 07ef0d6c authored by Xiang Li's avatar Xiang Li
Browse files
Options

fix merge error

parent 5617907f
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 8 deletions
source/Lib/EncoderLib/EncGOP.cpp
View file @ 07ef0d6c
......@@ -1763,14 +1763,6 @@ void EncGOP::compressGOP( int iPOCLast, int iNumPicRcvd, PicList& rcListPic,
refPicListModification->setRefPicListModificationFlagL1(0);
pcSlice->setNumRefIdx(REF_PIC_LIST_0, std::min(m_pcCfg->getGOPEntry(iGOPid).m_numRefPicsActive, pcSlice->getRPS()->getNumberOfPictures()));
pcSlice->setNumRefIdx(REF_PIC_LIST_1, std::min(m_pcCfg->getGOPEntry(iGOPid).m_numRefPicsActive, pcSlice->getRPS()->getNumberOfPictures()));
#if JVET_K0076_CPR
if (pcSlice->getSPS()->getSpsNext().getIBCMode())
{
if (m_pcCfg->getIntraPeriod() > 0 && pcSlice->getPOC() % m_pcCfg->getIntraPeriod() == 0)
{
pcSlice->setNumRefIdx(REF_PIC_LIST_0, 0);
pcSlice->setNumRefIdx(REF_PIC_LIST_1, 0);
}
#if JVET_K0076_CPR
if (pcSlice->getSPS()->getSpsNext().getIBCMode())
{
......
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