Ticket #306: reference_list_bug_fix.patch

Lib/TLibCommon/TComSlice.cpp

@@ -625 +625 @@
   {
     for( i = 0; i < m_RefPicListModification.getNumberOfRefPicListModificationsL0(); i++)
     {
-      for( cIdx = num_ref_idx_l1_active_minus1 + 1; cIdx > i; cIdx-- )
+      for( cIdx = num_ref_idx_l0_active_minus1 + 1; cIdx > i; cIdx-- )
         m_apcRefPicList[0][ cIdx ] = m_apcRefPicList[0][ cIdx - 1];
       if(m_RefPicListModification.getListIdcL0(i) == 0)
         m_apcRefPicList[0][ i ] =  RefPicSetStCurr0[ m_RefPicListModification.getRefPicSetIdxL0(i) ];

Lib/TLibDecoder/TDecCAVLC.cpp

@@ -1029 +1029 @@
           READ_FLAG( uiCode, "pic_from_list_0_flag" );
           rpcSlice->setListIdFromIdxOfLC(i, uiCode);
           READ_UVLC( uiCode, "ref_idx_list_curr" );
-          rpcSlice->setRefIdxFromIdxOfLC(i, uiCode);
+          rpcSlice->setRefIdxFromIdxOfLC(i, uiCode^1);
           rpcSlice->setRefIdxOfLC((RefPicList)rpcSlice->getListIdFromIdxOfLC(i), rpcSlice->getRefIdxFromIdxOfLC(i), i);
         }
       }

Lib/TLibEncoder/TEncCavlc.cpp

@@ -904 +904 @@
       {
         for (UInt i=0;i<pcSlice->getNumRefIdx(REF_PIC_LIST_C);i++)
         {
-          WRITE_FLAG( pcSlice->getListIdFromIdxOfLC(i),               "pic_from_list_0_flag" );
+          WRITE_FLAG( pcSlice->getListIdFromIdxOfLC(i)^1,               "pic_from_list_0_flag" );
           WRITE_UVLC( pcSlice->getRefIdxFromIdxOfLC(i),               "ref_idx_list_curr" );
         }
       }