Changeset 1336 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibEncoder

Timestamp:

22 Jul 2015, 02:46:03 (10 years ago)

Author:

seregin

Message:

port rev 4414

Location:

branches/SHM-dev/source/Lib/TLibEncoder

Files:

• TEncGOP.cpp (modified) (5 diffs)
• TEncGOP.h (modified) (1 diff)
• TEncSlice.cpp (modified) (4 diffs)

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

@@ -82 +82 @@
   m_iNumPicCoded        = 0; //Niko
   m_bFirst              = true;
-#if ALLOW_RECOVERY_POINT_AS_RAP
   m_iLastRecoveryPicPOC = 0;
-#endif
 
   m_pcCfg               = NULL;
@@ -886 +884 @@
     seiMessages.push_back(recoveryPointSEI);
 
-#if ALLOW_RECOVERY_POINT_AS_RAP
     if(m_pcCfg->getDecodingRefreshType() == 3)
     {
       m_iLastRecoveryPicPOC = slice->getPOC();
     }
-#endif
   }
   if (m_pcCfg->getTemporalLevel0IndexSEIEnabled())
@@ -1952 +1948 @@
     }
 
-#if ALLOW_RECOVERY_POINT_AS_RAP
     if ((pcSlice->checkThatAllRefPicsAreAvailable(rcListPic, pcSlice->getRPS(), false, m_iLastRecoveryPicPOC, m_pcCfg->getDecodingRefreshType() == 3) != 0) || (pcSlice->isIRAP()) 
       || (m_pcCfg->getEfficientFieldIRAPEnabled() && isField && pcSlice->getAssociatedIRAPType() >= NAL_UNIT_CODED_SLICE_BLA_W_LP && pcSlice->getAssociatedIRAPType() <= NAL_UNIT_CODED_SLICE_CRA && pcSlice->getAssociatedIRAPPOC() == pcSlice->getPOC()+1)
@@ -1959 +1954 @@
       pcSlice->createExplicitReferencePictureSetFromReference(rcListPic, pcSlice->getRPS(), pcSlice->isIRAP(), m_iLastRecoveryPicPOC, m_pcCfg->getDecodingRefreshType() == 3, m_pcCfg->getEfficientFieldIRAPEnabled());
     }
-#else
-    if ((pcSlice->checkThatAllRefPicsAreAvailable(rcListPic, pcSlice->getRPS(), false) != 0) || (pcSlice->isIRAP()))
-    {
-      pcSlice->createExplicitReferencePictureSetFromReference(rcListPic, pcSlice->getRPS(), pcSlice->isIRAP(), m_pcCfg->getEfficientFieldIRAPEnabled());
-    }
-#endif
+
 #if ALIGNED_BUMPING
     pcSlice->checkLeadingPictureRestrictions(rcListPic, true);
@@ -3485 +3475 @@
   }
 
-#if ALLOW_RECOVERY_POINT_AS_RAP
   if(m_pcCfg->getDecodingRefreshType() != 3 && (pocCurr - isField) % m_pcCfg->getIntraPeriod() == 0)
-#else
-  if ((pocCurr - isField) % m_pcCfg->getIntraPeriod() == 0)
-#endif
   {
     if (m_pcCfg->getDecodingRefreshType() == 1)

branches/SHM-dev/source/Lib/TLibEncoder/TEncGOP.h

@@ -103 +103 @@
   Int                     m_iNumPicCoded;
   Bool                    m_bFirst;
-#if ALLOW_RECOVERY_POINT_AS_RAP
   Int                     m_iLastRecoveryPicPOC;
-#endif
 
   //  Access channel

branches/SHM-dev/source/Lib/TLibEncoder/TEncSlice.cpp

@@ -304 +304 @@
   if(!(isField && pocLast == 1) || !m_pcCfg->getEfficientFieldIRAPEnabled())
   {
-#if ALLOW_RECOVERY_POINT_AS_RAP
     if(m_pcCfg->getDecodingRefreshType() == 3)
     {
@@ -311 +310 @@
     else
     {
-#endif
       eSliceType = (pocLast == 0 || (pocCurr - (isField ? 1 : 0)) % m_pcCfg->getIntraPeriod() == 0 || m_pcGOPEncoder->getGOPSize() == 0) ? I_SLICE : eSliceType;
-#if ALLOW_RECOVERY_POINT_AS_RAP
-    }
-#endif
+    }
   }
 
@@ -452 +448 @@
     if(!(isField && pocLast == 1) || !m_pcCfg->getEfficientFieldIRAPEnabled())
     {
-#if ALLOW_RECOVERY_POINT_AS_RAP
       if(m_pcCfg->getDecodingRefreshType() == 3)
       {
@@ -459 +454 @@
       else
       {
-#endif
         eSliceType = (pocLast == 0 || (pocCurr - (isField ? 1 : 0)) % m_pcCfg->getIntraPeriod() == 0 || m_pcGOPEncoder->getGOPSize() == 0) ? I_SLICE : eSliceType;
-#if ALLOW_RECOVERY_POINT_AS_RAP
-      }
-#endif
+      }
     }