Changeset 89 in SHVCSoftware for branches/HM-10.0-dev-SHM/source/Lib

Timestamp:

16 Mar 2013, 06:55:07 (12 years ago)

Author:

seregin

Message:

IDR alignment

Location:

branches/HM-10.0-dev-SHM/source/Lib

Files:

• TLibCommon/TComSlice.cpp (modified) (1 diff)
• TLibCommon/TypeDef.h (modified) (1 diff)
• TLibEncoder/TEncGOP.cpp (modified) (2 diffs)

branches/HM-10.0-dev-SHM/source/Lib/TLibCommon/TComSlice.cpp

@@ -2036 +2036 @@
 // Assumed that RPL of the base layer is same to the EL, otherwise this information should be also dumped and read from the metadata file
   setPOC( pcSlice->getPOC() );
-  if( pcSlice->getNalUnitType() == NAL_UNIT_CODED_SLICE_CRA )
+  if( pcSlice->getNalUnitType() >= NAL_UNIT_CODED_SLICE_BLA && pcSlice->getNalUnitType() <= NAL_UNIT_CODED_SLICE_CRA )
   {
     setSliceType( I_SLICE );

branches/HM-10.0-dev-SHM/source/Lib/TLibCommon/TypeDef.h

@@ -62 +62 @@
 #define JCTVC_L0178                      1      ///< implementation of JCTVC-L0178 (code only supports right and bottom croppping offsets)
 #endif
+
+#define IDR_ALIGNMENT                    1      ///< align IDR picures across layers 
 
 #if AVC_BASE

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

@@ -413 +413 @@
     pcSlice->setNalUnitType(getNalUnitType(pocCurr));
 #if REF_IDX_FRAMEWORK
+#if IDR_ALIGNMENT
+    TComList<TComPic*> *cListPic = m_ppcTEncTop[m_layerId-1]->getListPic();
+    pcSlice->setBaseColPic (*cListPic, m_layerId );
+#endif
+
     if( m_layerId > 0 && (pocCurr % m_pcCfg->getIntraPeriod() == 0) )
     {
+#if IDR_ALIGNMENT
+      if( pcSlice->getBaseColPic()->getSlice(0)->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR )
+      {
+        pcSlice->setNalUnitType(NAL_UNIT_CODED_SLICE_IDR);
+      }
+      else
+#endif
       pcSlice->setNalUnitType(NAL_UNIT_CODED_SLICE_CRA);
     }
@@ -516 +528 @@
     if(m_layerId > 0)
     {
+#if !IDR_ALIGNMENT
       TComList<TComPic*> *cListPic = m_ppcTEncTop[m_layerId-1]->getListPic();
       pcSlice->setBaseColPic (*cListPic, m_layerId );
+#endif
 #if SVC_UPSAMPLING
       if ( pcPic->isSpatialEnhLayer())