Changeset 1505 in SHVCSoftware

Timestamp:

11 Dec 2015, 22:45:18 (8 years ago)

Author:

seregin

Message:

move ILRP init after PS activation

Location:

branches/SHM-dev/source/Lib/TLibDecoder

Files:

• TDecTop.cpp (modified) (4 diffs)
• TDecTop.h (modified) (1 diff)

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

@@ -1327 +1327 @@
   }
   m_apcSlicePilot->setAvailableForTMVPRefFlag( true );
-
-  // Initialize ILRP if needed, only for the current layer  
-  // ILRP intialization should go along with activation of parameters sets, 
-  // although activation of parameter sets itself need not be done for each and every slice!!!
-  xInitILRP(m_apcSlicePilot);
-
 #else //SVC_EXTENSION
   //we should only get a different poc for a new picture (with CTU address==0)
@@ -1385 +1379 @@
   if (m_bFirstSliceInPicture)
   {
+    // Initialize ILRP if needed, only for the current layer  
+    // ILRP intialization should go along with activation of parameters sets, 
+    // although activation of parameter sets itself need not be done for each and every slice!!!
+    xInitILRP(pcSlice->getSPS(), pcSlice->getPPS());
+
 #if AVC_BASE
     if( m_layerId > 0 && vps->getNonHEVCBaseLayerFlag() )
@@ -2260 +2259 @@
 
 #if SVC_EXTENSION
-Void TDecTop::xInitILRP(TComSlice *slice)
-{
-  const TComVPS* vps  = slice->getVPS();
-  const TComSPS* sps  = slice->getSPS();
-
+Void TDecTop::xInitILRP(const TComSPS *sps, const TComPPS *pps)
+{
   if( m_layerId > 0 )
   {
@@ -2273 +2269 @@
         m_cIlpPic[j] = new  TComPic;
 
-        m_cIlpPic[j]->create(*sps, *slice->getPPS(), true, m_layerId);
+        m_cIlpPic[j]->create(*sps, *pps, true, m_layerId);
 
         for (Int i=0; i<m_cIlpPic[j]->getPicSym()->getNumberOfCtusInFrame(); i++)

branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.h

@@ -254 +254 @@
   TComPic*  getBlPic()                                                      { return m_blPic;         }
 #endif
-  Void      xInitILRP(TComSlice *slice);
+  Void      xInitILRP(const TComSPS *sps, const TComPPS *pps);
   CommonDecoderParams*    getCommonDecoderParams()                          { return m_commonDecoderParams; }
   Void                    setCommonDecoderParams(CommonDecoderParams* x)    { m_commonDecoderParams = x;    }