Changeset 518 in 3DVCSoftware

Timestamp:

3 Jul 2013, 21:39:14 (11 years ago)

Author:

mitsubishi-htm

Message:

-Intermediate version. Fixing xAddVspCand.

File:

• branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComDataCU.cpp (modified) (2 diffs)

branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComDataCU.cpp

@@ -2686 +2686 @@
   Int  iRefListIdX = 0;
   Int  iRefListIdY = 0;
+  Int  i;
 
   for( iRefListIdX = 0; iRefListIdX < 2 && !refViewAvailFlag; iRefListIdX++ )
   {
     RefPicList eRefPicList = RefPicList( iRefListIdX );
-    for (Int i = 0; i < m_pcSlice->getNumRefIdx(eRefPicList) && !refViewAvailFlag; i++)
+    for ( i = 0; i < m_pcSlice->getNumRefIdx(eRefPicList) && !refViewAvailFlag; i++ )
     {
       Int viewIdxRefInList = m_pcSlice->getRefPic(eRefPicList, i)->getViewIndex();
       if (refViewIdx == viewIdxRefInList)
       {
-        Int iRefIdxList0 = getSlice()->getRefPic(REF_PIC_LIST_0, 0)->getPOC() == getSlice()->getPOC() ? 
-                           0 : getSlice()->getAlterRefIdx(REF_PIC_LIST_0);
-
         refViewAvailFlag = true;
-        predFlag[0] = 1; // iRefListIdX
+        predFlag[iRefListIdX] = 1;
         iRefListIdY = 1 - iRefListIdX;
-        pcMvFieldNeighbours[iCount<<1].setMvField( pDInfo->m_acDoNBDV, iRefIdxList0 );
-        // pcMvFieldNeighbours[(iCount<<1)+iRefListIdX].setMvField( pDInfo->m_acDoNBDV, i ); // Buggy code
+        pcMvFieldNeighbours[(iCount<<1)+iRefListIdX].setMvField( pDInfo->m_acDoNBDV, i );
       }
     }
@@ -2711 +2708 @@
     RefPicList eRefPicList = RefPicList( iRefListIdY );
     refViewAvailFlag = false;
-    for (Int i = 0; i < m_pcSlice->getNumRefIdx(eRefPicList) && !refViewAvailFlag; i++)
-    {
-      Int viewIdxRefInList = m_pcSlice->getRefPic(eRefPicList, i)->getViewIndex();
-      if (refViewIdx != viewIdxRefInList)
-      {
-        Int iRefIdxList1 = getSlice()->getRefPic(REF_PIC_LIST_1, 0)->getPOC() == getSlice()->getPOC() ? 
-                           0 : getSlice()->getAlterRefIdx(REF_PIC_LIST_1);
-
-        refViewAvailFlag = true;
-        predFlag[1] = 1; // iRefListIdY
-        pcMvFieldNeighbours[(iCount<<1)+1].setMvField( pDInfo->m_acDoNBDV, iRefIdxList1 );
-        //pcMvFieldNeighbours[(iCount<<1)+iRefListIdY].setMvField( pDInfo->m_acDoNBDV, i );  // Buggy code
+    for ( i = 0; i < m_pcSlice->getNumRefIdx(eRefPicList) && !refViewAvailFlag; i++ )
+    {
+      TComPic* refPic = m_pcSlice->getRefPic(eRefPicList, i);
+      if ( refPic->getPOC() == m_pcSlice->getPOC() ) // is inter-view reference
+      {
+        Int viewIdxRefInList = refPic->getViewIndex();
+        if (refViewIdx != viewIdxRefInList)
+        {
+          refViewAvailFlag = true;
+          predFlag[iRefListIdY] = 1;
+          pcMvFieldNeighbours[(iCount<<1)+iRefListIdY].setMvField( pDInfo->m_acDoNBDV, i );
+        }
       }
     }