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

Timestamp:

8 Oct 2013, 02:34:31 (11 years ago)

Author:

qualcomm

Message:

Integration of N0147 and removal of IDR_ALIGNMENT (as per N0373)

File:

• branches/SHM-3.1-dev/source/Lib/TLibEncoder/TEncGOP.cpp (modified) (1 diff)

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

@@ -662 +662 @@
       if( pocCurr % m_pcCfg->getIntraPeriod() == 0 )
       {
-#if IDR_ALIGNMENT
+#if N0147_IRAP_ALIGN_FLAG
+       if( m_layerId > 0 && pcSlice->getVPS()->getCrossLayerIrapAlignFlag())
+       {
         TComList<TComPic*> *cListPic = m_ppcTEncTop[m_layerId]->getRefLayerEnc(0)->getListPic();
         TComPic* picLayer0 = pcSlice->getRefPic(*cListPic, pcSlice->getPOC() );
+         if( picLayer0->getSlice(0)->isIRAP())
+        {
+          pcSlice->setNalUnitType(picLayer0->getSlice(0)->getNalUnitType());
+        }
+        else
+         {
+           pcSlice->setNalUnitType(NAL_UNIT_CODED_SLICE_CRA);
+         }
+       }
+#else
+          pcSlice->setNalUnitType(NAL_UNIT_CODED_SLICE_CRA);
+#endif 
+
+#if IDR_ALIGNMENT
+         TComList<TComPic*> *cListPic = m_ppcTEncTop[m_layerId]->getRefLayerEnc(0)->getListPic();
+         TComPic* picLayer0 = pcSlice->getRefPic(*cListPic, pcSlice->getPOC() );
         if( picLayer0->getSlice(0)->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR_W_RADL || picLayer0->getSlice(0)->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR_N_LP )
-        {
-          pcSlice->setNalUnitType(picLayer0->getSlice(0)->getNalUnitType());
-        }
-        else
-#endif
+         {
+           pcSlice->setNalUnitType(picLayer0->getSlice(0)->getNalUnitType());
+         }
+         else
+         {
           pcSlice->setNalUnitType(NAL_UNIT_CODED_SLICE_CRA);
+         }
+#endif 
       }