Changeset 811 in SHVCSoftware for branches/SHM-6-dev/source/Lib/TLibEncoder/TEncGOP.cpp

Timestamp:

28 Jun 2014, 00:51:00 (10 years ago)

Author:

seregin

Message:

fix AI config POC > 129 related to HM ticket #1127, patch was provided by Ramasubramonian, Adarsh Krishnan <aramasub@…>

File:

• branches/SHM-6-dev/source/Lib/TLibEncoder/TEncGOP.cpp (modified) (2 diffs)

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

@@ -1265 +1265 @@
         else
         {
-#if ALIGN_IRAP_BUGFIX
-#if 0
+#if !ALIGN_IRAP_BUGFIX
           pcSlice->setNalUnitType(NAL_UNIT_CODED_SLICE_CRA);
-#endif
 #endif
         }
@@ -1291 +1289 @@
     {
       if (pcSlice->getNalUnitType() == NAL_UNIT_CODED_SLICE_TRAIL_R &&
+#if SVC_EXTENSION
+        ( m_iGopSize != 1 || m_ppcTEncTop[m_layerId]->getIntraPeriod() > 1 ) )
+#else
           !(m_iGopSize == 1 && pcSlice->getSliceType() == I_SLICE))
+#endif
         // Add this condition to avoid POC issues with encoder_intra_main.cfg configuration (see #1127 in bug tracker)
       {