Changeset 1510 in SHVCSoftware for branches

Timestamp:

15 Dec 2015, 17:36:20 (9 years ago)

Author:

seregin

Message:

update SPS setting to non HEVC BL

Location:

branches/SHM-dev/source/Lib

Files:

• TLibCommon/TComPicSym.h (modified) (1 diff)
• TLibDecoder/TDecTop.cpp (modified) (3 diffs)

branches/SHM-dev/source/Lib/TLibCommon/TComPicSym.h

@@ -192 +192 @@
   Bool         getSkippedTileSetFlag( Int i )                        { return *(m_pbSkippedTileSetFlag + i); }
 #endif
-  Void         inferSpsForNonHEVCBL(TComVPS *vps)                    { m_sps.inferSPS(0, vps);               }
+  Void         inferSpsForNonHEVCBL(TComVPS *vps, const UInt maxCuWidth, const UInt maxCuHeight)  { m_sps.inferSPS(0, vps); m_sps.setMaxCUWidth(maxCuWidth), m_sps.setMaxCUHeight(maxCuHeight); }
 #endif //SVC_EXTENSION
 

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

@@ -520 +520 @@
         UInt refLayerId = 0;
 
-        pBLPic->create( *sps, *pps, true, refLayerId);
+        pBLPic->getPicSym()->inferSpsForNonHEVCBL(vps, sps->getMaxCUWidth(), sps->getMaxCUHeight());
+
+        pBLPic->create( pBLPic->getPicSym()->getSPS(), *pps, true, refLayerId);
 
         // it is needed where the VPS is accessed through the slice
         pBLPic->getSlice(0)->setVPS( vps );
-        pBLPic->getPicSym()->inferSpsForNonHEVCBL(vps);
         pBLPic->getSlice(0)->setSPS( &pBLPic->getPicSym()->getSPS() );
       }
@@ -1643 +1644 @@
           if( pic )
           {
-            pcSlice->setBaseColPic ( refLayerIdc, pic );
+            pcSlice->setBaseColPic( refLayerIdc, pic );
           }
           else
@@ -1654 +1655 @@
           TDecTop *pcTDecTop = (TDecTop *)getRefLayerDec( refLayerIdc );
           TComList<TComPic*> *cListPic = pcTDecTop->getListPic();
-          if( !pcSlice->setBaseColPic ( *cListPic, refLayerIdc ) )
+          if( !pcSlice->setBaseColPic( *cListPic, refLayerIdc ) )
           {
             continue;