Changeset 107 in SHVCSoftware for branches

Timestamp:

2 Apr 2013, 17:28:46 (12 years ago)

Author:

interdigital

Message:

reference picture list construction bug fix for adding ILR picture to match SHM test model text.

Location:

branches/HM-10.0-dev-SHM/source/Lib/TLibEncoder

Files:

• TEncGOP.cpp (modified) (3 diffs)
• TEncTop.cpp (modified) (1 diff)

branches/HM-10.0-dev-SHM/source/Lib/TLibEncoder/TEncGOP.cpp

@@ -524 +524 @@
     pcSlice->setNumRefIdx(REF_PIC_LIST_1,min(m_pcCfg->getGOPEntry(iGOPid).m_numRefPicsActive,pcSlice->getRPS()->getNumberOfPictures()));
 
+#if REF_LIST_BUGFIX
+    if(m_layerId > 0)
+    {
+      if( pcSlice->getNalUnitType() >= NAL_UNIT_CODED_SLICE_BLA && pcSlice->getNalUnitType() <= NAL_UNIT_CODED_SLICE_CRA )
+      {
+        pcSlice->setNumRefIdx(REF_PIC_LIST_0, pcSlice->getNumILRRefIdx());
+        pcSlice->setNumRefIdx(REF_PIC_LIST_1, pcSlice->getNumILRRefIdx());
+      }
+      else
+      {
+        pcSlice->setNumRefIdx(REF_PIC_LIST_0, pcSlice->getNumRefIdx(REF_PIC_LIST_0)+pcSlice->getNumILRRefIdx());
+        pcSlice->setNumRefIdx(REF_PIC_LIST_1, pcSlice->getNumRefIdx(REF_PIC_LIST_1)+pcSlice->getNumILRRefIdx());
+      }
+    }
+#endif
+
 #if ADAPTIVE_QP_SELECTION
     pcSlice->setTrQuant( m_pcEncTop->getTrQuant() );
@@ -557 +573 @@
 
     //  Set reference list
+#if REF_LIST_BUGFIX
+    if(m_layerId ==  0)
+    {
+      pcSlice->setRefPicList( rcListPic);
+    }
+#else
     pcSlice->setRefPicList ( rcListPic );
+#endif
 #if REF_IDX_FRAMEWORK
     if(m_layerId > 0)
@@ -569 +592 @@
       }
 #endif
+#if REF_LIST_BUGFIX
+      pcSlice->setRefPicListModificationSvc();
+      pcSlice->setRefPicListSvc( rcListPic, m_pcEncTop->getIlpList() );
+#else
       pcSlice->addRefPicList ( m_pcEncTop->getIlpList(), 1);
+#endif
 
 #if REF_IDX_MFM

branches/HM-10.0-dev-SHM/source/Lib/TLibEncoder/TEncTop.cpp

@@ -809 +809 @@
     }
   }
+#if REF_LIST_BUGFIX
+  if (!m_layerId)
+  {
+    m_cPPS.setListsModificationPresentFlag(false);
+  }
+  else
+  {
+    m_cPPS.setListsModificationPresentFlag(true);
+  }
+#endif
 #if SVC_EXTENSION
   m_cPPS.setPPSId         ( m_iPPSIdCnt         );