Ticket #599: MSBCYCLE_BUGFIX_r2479.patch

TComSlice.cpp

@@ -271 +271 @@
   return  pcPic;
 }
 
-
+#if MSBCYCLE_BUGFIX
 TComPic* TComSlice::xGetLongTermRefPic (TComList<TComPic*>& rcListPic,
+                                UInt                uiPOC, Bool msbPresent)
+#else
+TComPic* TComSlice::xGetLongTermRefPic (TComList<TComPic*>& rcListPic,
                                 UInt                uiPOC)
+#endif
 {
   TComList<TComPic*>::iterator  iterPic = rcListPic.begin();  
   TComPic*                      pcPic = *(iterPic);
@@ -281 +285 @@
   while ( iterPic != rcListPic.end() )
   {
     pcPic = *(iterPic);
+#if MSBCYCLE_BUGFIX
+    if(pcPic && 
+        ( ((pcPic->getPOC()%(1<<getSPS()->getBitsForPOC())) == (uiPOC%(1<<getSPS()->getBitsForPOC())) && !msbPresent ) ||
+          ((pcPic->getPOC() == uiPOC)                                                                 &&  msbPresent )
+        )
+      )
+#else
     if(pcPic && (pcPic->getPOC()%(1<<getSPS()->getBitsForPOC())) == (uiPOC%(1<<getSPS()->getBitsForPOC())))
+#endif
     {
       if(pcPic->getIsLongTerm())
         return pcPic;
@@ -426 +438 @@
   {
     if(m_pcRPS->getUsed(i))
     {
+#if MSBCYCLE_BUGFIX
+      pcRefPic = xGetLongTermRefPic(rcListPic, m_pcRPS->getPOC(i), m_pcRPS->getCheckLTMSBPresent(i));
+#else
       pcRefPic = xGetLongTermRefPic(rcListPic, m_pcRPS->getPOC(i));
+#endif
       pcRefPic->setIsLongTerm(1);
 #if NO_MV_SCALING_IF_LONG_TERM_REF
       pcRefPic->setIsUsedAsLongTerm(1);
@@ -437 +453 @@
     }
     if(pcRefPic==NULL) 
     {
+#if MSBCYCLE_BUGFIX
+      pcRefPic = xGetLongTermRefPic(rcListPic, m_pcRPS->getPOC(i), m_pcRPS->getCheckLTMSBPresent(i));
+#else
       pcRefPic = xGetLongTermRefPic(rcListPic, m_pcRPS->getPOC(i));
+#endif
     }
     pcRefPic->setCheckLTMSBPresent(m_pcRPS->getCheckLTMSBPresent(i));  
   }
@@ -980 +1000 @@
       {
         j++;
         rpcPic = *(iterPic++);
-
+#if MSBCYCLE_BUGFIX
+        Int maxPicOrderCntLsb = (1<<rpcPic->getPicSym()->getSlice(0)->getSPS()->getBitsForPOC());
+        Int currPOC = rpcPic->getPicSym()->getSlice(0)->getPOC();
+        Int currLSB = currPOC % maxPicOrderCntLsb;
+        Int refPOC  = pReferencePictureSet->getPOC(i);
+        Int refLSB  = refPOC % maxPicOrderCntLsb;
+        if(rpcPic->getSlice(0)->isReferenced() &&
+          (
+            ( (currLSB == refLSB) && !pReferencePictureSet->getCheckLTMSBPresent(i)) ||
+            ( (currPOC == refPOC) &&  pReferencePictureSet->getCheckLTMSBPresent(i))
+          )
+        )
+          
+#else
         if((rpcPic->getPicSym()->getSlice(0)->getPOC()%(1<<rpcPic->getPicSym()->getSlice(0)->getSPS()->getBitsForPOC())) == (this->getPOC() + pReferencePictureSet->getDeltaPOC(i))%(1<<rpcPic->getPicSym()->getSlice(0)->getSPS()->getBitsForPOC()) && rpcPic->getSlice(0)->isReferenced())
+#endif
         {
           isAvailable = 1;
           rpcPic->setIsLongTerm(1);

TComSlice.h

@@ -1425 +1425 @@
 protected:
   TComPic*  xGetRefPic  (TComList<TComPic*>& rcListPic,
                          UInt                uiPOC);
+#if MSBCYCLE_BUGFIX
+    TComPic*  xGetLongTermRefPic  (TComList<TComPic*>& rcListPic,
+                         UInt                uiPOC, Bool msbPresent);
+#else
   TComPic*  xGetLongTermRefPic  (TComList<TComPic*>& rcListPic,
                          UInt                uiPOC);
+#endif
 };// END CLASS DEFINITION TComSlice
 
 

TypeDef.h

@@ -40 +40 @@
 
 //! \ingroup TLibCommon
 //! \{
+#define MSBCYCLE_BUGFIX  1 ////< Bug fix: MSB presence check while accessing LTRPs.
 #define  TEMPORAL_ID_RESTRICTION         1  ///< I0600: Semantics of temporal_id changed
 #define PREVREFPIC_DEFN                    1   ///< I0345: prevRefPic defined as previous reference picture that is at same or lower 
                                             ///< temporal layer.