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

Timestamp:

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

Author:

qualcomm

Message:

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

Location:

branches/SHM-3.1-dev/source/Lib

Files:

• TLibCommon/TypeDef.h (modified) (1 diff)
• TLibDecoder/TDecTop.cpp (modified) (1 diff)
• TLibEncoder/TEncGOP.cpp (modified) (1 diff)

branches/SHM-3.1-dev/source/Lib/TLibCommon/TypeDef.h

@@ -108 +108 @@
 #define ILP_RAP                          1      ///< JCTVC-M0208 proposal 3
 
-#define IDR_ALIGNMENT                    1      ///< align IDR picures across layers 
+#define IDR_ALIGNMENT                    0      ///< align IDR picures across layers : As per JCTVC-N0373, IDR are not required to be aligned.
 
 #define AVC_BASE                         1      ///< YUV BL reading for AVC base SVC

branches/SHM-3.1-dev/source/Lib/TLibDecoder/TDecTop.cpp

@@ -1110 +1110 @@
     if(  m_layerId > 0 && pcSlice->getVPS()->getCrossLayerIrapAlignFlag())
     {
-      if(pcSlice->isIRAP())
-      {
-        for(Int depedentLayerId = 0; depedentLayerId < pcSlice->getVPS()->getNumDirectRefLayers(m_layerId); depedentLayerId++)
-          assert(pcSlice->getNalUnitType() == pcSlice->getBaseColPic(depedentLayerId)->getSlice(0)->getNalUnitType());
-      }
+      for( Int i = 0; i < pcPic->getSlice(0)->getActiveNumILRRefIdx(); i++ )
+      {
+        Int refLayerIdc = pcPic->getSlice(0)->getInterLayerPredLayerIdc(i);
+
+        if(m_cIlpPic[refLayerIdc] && m_cIlpPic[refLayerIdc]->getSlice(0)->isIRAP())
+        {                 
+          assert(pcSlice->getNalUnitType() == m_cIlpPic[refLayerIdc]->getSlice(0)->getNalUnitType());
+      }
+    }
     }
 #endif 
+    
     // For generalized B
     // note: maybe not existed case (always L0 is copied to L1 if L1 is empty)

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 
       }