Changeset 429 in SHVCSoftware

Timestamp:

10 Oct 2013, 20:57:10 (11 years ago)

Author:

qualcomm

Message:

Modification to asserts in setRefPicListModificationSvc when cross_layer_irap_aligned in enabled.

Location:

branches/SHM-3.1-dev/source/Lib

Files:

• TLibCommon/TComSlice.cpp (modified) (2 diffs)
• TLibEncoder/TEncGOP.cpp (modified) (1 diff)

branches/SHM-3.1-dev/source/Lib/TLibCommon/TComSlice.cpp

@@ -764 +764 @@
 #endif
 
+#if N0147_IRAP_ALIGN_FLAG
+  assert(m_aiNumRefIdx[REF_PIC_LIST_0] > 0);
+  assert(m_aiNumRefIdx[REF_PIC_LIST_1] > 0);
+#else
   assert(m_aiNumRefIdx[REF_PIC_LIST_0] > 1);
   assert(m_aiNumRefIdx[REF_PIC_LIST_1] > 1);
+#endif
+
 
   //set L0 inter-layer reference picture modification
 #if RPL_INIT_N0316_N0082
   Bool hasModification = (m_aiNumRefIdx[REF_PIC_LIST_0] == (numberOfPocBeforeCurr + m_activeNumILRRefIdx)) ? false : true;
+#if N0147_IRAP_ALIGN_FLAG
+  hasModification = hasModification && ( m_aiNumRefIdx[REF_PIC_LIST_0] > 1 );
+#endif
 #else
   Bool hasModification = (m_aiNumRefIdx[REF_PIC_LIST_0] == numberOfRpsCurrTempList) ? false : true;
+#if N0147_IRAP_ALIGN_FLAG
+  hasModification = hasModification && ( m_aiNumRefIdx[REF_PIC_LIST_0] > 1 );
+#endif
+
 #endif
 #if FINAL_RPL_CHANGE_N0082
@@ -821 +834 @@
   //set L1 inter-layer reference picture modification
   hasModification = (m_aiNumRefIdx[REF_PIC_LIST_1] == numberOfRpsCurrTempList) ? false : true;
+#if N0147_IRAP_ALIGN_FLAG
+  hasModification = hasModification && ( m_aiNumRefIdx[REF_PIC_LIST_1] > 1 );
+#endif
+
   refPicListModification->setRefPicListModificationFlagL1(hasModification);
   if(hasModification)

branches/SHM-3.1-dev/source/Lib/TLibEncoder/TEncGOP.cpp

@@ -1031 +1031 @@
     pcSlice->setRefPicList ( rcListPic );
 #endif //SVC_EXTENSION
-#if N0147_IRAP_ALIGN_FLAG
-    if(pcSlice->getNumRefIdx(REF_PIC_LIST_0) > 1 || pcSlice->getNumRefIdx(REF_PIC_LIST_1) > 1)
-#endif 
-    {
       pcSlice->setRefPicListModificationSvc();
-    }
       pcSlice->setRefPicList( rcListPic, false, m_pcEncTop->getIlpList());