Changeset 237 in 3DVCSoftware for branches/HTM-5.1-dev2-Qualcomm/source/Lib/TLibCommon/TComSlice.cpp

Timestamp:

28 Jan 2013, 22:13:59 (12 years ago)

Author:

qualcomm

Message:

QC_C0047&51

File:

• branches/HTM-5.1-dev2-Qualcomm/source/Lib/TLibCommon/TComSlice.cpp (modified) (2 diffs)

branches/HTM-5.1-dev2-Qualcomm/source/Lib/TLibCommon/TComSlice.cpp

@@ -199 +199 @@
   m_numEntryPointOffsets = 0;
 #endif
+#if QC_TMVP_MRG_REFIDX_C0047
+  m_aiNewRefIdx[0]                  = -1;
+  m_aiNewRefIdx[1]                  = -1;
+#endif
 }
 
@@ -419 +423 @@
     }
   }
+#if QC_TMVP_MRG_REFIDX_C0047
+  Int  iCurrPOC = this->getPOC();
+  for ( UInt uiRefListIdx = 0; uiRefListIdx < 2; uiRefListIdx++ )//just to get one updated ref idx for merge in each L0/L1 direction, if it is not avaialbe, it is still -1 
+  {        
+    if ( this->getNumRefIdx( RefPicList( uiRefListIdx ) ) == 0)
+        continue;
+
+    Bool bZeroIdxInterViewFlag =  ( this->getRefPic(RefPicList(uiRefListIdx), 0)->getPOC() == iCurrPOC ) ? true : false;
+    for(Int i = 1; i < this->getNumRefIdx(RefPicList(uiRefListIdx)); i++ )
+    {
+      if ( (bZeroIdxInterViewFlag && this->getRefPic(RefPicList(uiRefListIdx), i)->getPOC() != iCurrPOC ) ||
+           (!bZeroIdxInterViewFlag && this->getRefPic(RefPicList(uiRefListIdx), i)->getPOC() == iCurrPOC ) )
+      {
+        this->setNewRefIdx(RefPicList(uiRefListIdx),i);
+        break;
+      }
+    }
+  }
+
+#endif
 }