- Timestamp:
- 11 Dec 2015, 19:35:23 (9 years ago)
- Location:
- branches/SHM-dev/source/Lib
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
TabularUnified branches/SHM-dev/source/Lib/TLibCommon/TComPic.cpp ¶
r1502 r1503 77 77 } 78 78 #if SVC_EXTENSION 79 Void TComPic::create( const TCom VPS &vps, const TComSPS &sps, const TComPPS &pps, const Bool bIsVirtual, const UInt layerId )79 Void TComPic::create( const TComSPS &sps, const TComPPS &pps, const Bool bIsVirtual, const UInt layerId ) 80 80 { 81 81 const ChromaFormat chromaFormatIDC = sps.getChromaFormatIdc(); … … 89 89 m_layerId = layerId; 90 90 91 m_picSym.create( vps,sps, pps, uiMaxDepth, layerId );91 m_picSym.create( sps, pps, uiMaxDepth, layerId ); 92 92 93 93 if (!bIsVirtual) -
TabularUnified branches/SHM-dev/source/Lib/TLibCommon/TComPic.h ¶
r1502 r1503 102 102 103 103 #if SVC_EXTENSION 104 Void create( const TCom VPS& vps, const TComSPS &sps, const TComPPS &pps, const Bool bIsVirtual /*= false*/, const UInt layerId );104 Void create( const TComSPS &sps, const TComPPS &pps, const Bool bIsVirtual /*= false*/, const UInt layerId ); 105 105 #else 106 106 Void create( const TComSPS &sps, const TComPPS &pps, const Bool bIsVirtual /*= false*/ ); -
TabularUnified branches/SHM-dev/source/Lib/TLibCommon/TComPicSym.cpp ¶
r1502 r1503 47 47 // ==================================================================================================================== 48 48 49 #if SVC_EXTENSION50 TComVPS TComPicSym::m_vps;51 #endif52 53 49 TComPicSym::TComPicSym() 54 50 :m_frameWidthInCtus(0) … … 82 78 83 79 #if SVC_EXTENSION 84 Void TComPicSym::create ( const TComVPS& vps, const TComSPS &sps, const TComPPS &pps, UInt uiMaxDepth, const UInt layerId ) 85 { 86 m_vps = vps; 80 Void TComPicSym::create ( const TComSPS &sps, const TComPPS &pps, UInt uiMaxDepth, const UInt layerId ) 81 { 87 82 #else 88 83 Void TComPicSym::create ( const TComSPS &sps, const TComPPS &pps, UInt uiMaxDepth ) … … 215 210 m_apSlices.back()->setPPS(&m_pps); 216 211 m_apSlices.back()->setSPS(&m_sps); 217 #if SVC_EXTENSION218 m_apSlices.back()->setVPS(&m_vps);219 #endif220 212 if (m_apSlices.size()>=2) 221 213 { -
TabularUnified branches/SHM-dev/source/Lib/TLibCommon/TComPicSym.h ¶
r1502 r1503 121 121 122 122 #if SVC_EXTENSION 123 // SHM: temporal solution to keep VPS with a picture, ideally it should be picture specific, but currently sizeof(TComVPS) = 86929196124 static TComVPS m_vps;125 123 #if N0383_IL_CONSTRAINED_TILE_SETS_SEI 126 124 Int* m_piTileSetIdxMap; //the map of the tile set index relative to LCU raster scan address … … 132 130 public: 133 131 #if SVC_EXTENSION 134 Void create ( const TCom VPS &vps, const TComSPS &sps, const TComPPS &pps, UInt uiMaxDepth, const UInt layerId );132 Void create ( const TComSPS &sps, const TComPPS &pps, UInt uiMaxDepth, const UInt layerId ); 135 133 #if CGS_3D_ASYMLUT 136 134 TComPPS* getPPSToUpdate() { return &m_pps; } … … 154 152 const TComPPS& getPPS() const { return m_pps; } 155 153 156 #if SVC_EXTENSION157 TComSlice * swapSliceObject(TComSlice* p, UInt i) { p->setVPS(&m_vps); p->setSPS(&m_sps); p->setPPS(&m_pps); TComSlice *pTmp=m_apSlices[i];m_apSlices[i] = p; pTmp->setVPS(0); pTmp->setSPS(0); pTmp->setPPS(0); return pTmp; }158 #else159 154 TComSlice * swapSliceObject(TComSlice* p, UInt i) { p->setSPS(&m_sps); p->setPPS(&m_pps); TComSlice *pTmp=m_apSlices[i];m_apSlices[i] = p; pTmp->setSPS(0); pTmp->setPPS(0); return pTmp; } 160 #endif161 155 UInt getNumAllocatedSlice() const { return UInt(m_apSlices.size()); } 162 156 Void allocateNewSlice(); … … 194 188 m_pbSkippedTileSetFlag[i] = skipFlag; 195 189 } 196 Int getTileSetIdxMap( Int i ) { return *(m_piTileSetIdxMap + i); }197 UChar getTileSetType( Int i ) { return *(m_pucTileSetType + i); }190 Int getTileSetIdxMap( Int i ) { return *(m_piTileSetIdxMap + i); } 191 UChar getTileSetType( Int i ) { return *(m_pucTileSetType + i); } 198 192 Bool getSkippedTileSetFlag( Int i ) { return *(m_pbSkippedTileSetFlag + i); } 199 193 #endif 200 Void inferSpsForNonHEVCBL( ) { m_sps.inferSPS(0, &m_vps);}194 Void inferSpsForNonHEVCBL(TComVPS *vps) { m_sps.inferSPS(0, vps); } 201 195 #endif //SVC_EXTENSION 202 196 -
TabularUnified branches/SHM-dev/source/Lib/TLibCommon/TComSlice.cpp ¶
r1502 r1503 3620 3620 if( layerId == 0 && vps->getNonHEVCBaseLayerFlag() ) 3621 3621 { 3622 repFormat = vps->getVpsRepFormat(layerId); 3622 // infered from vps_rep_format_idx[ 0 ]-th rep_format( ) syntax structure in the active VPS 3623 repFormat = vps->getVpsRepFormat(0); 3623 3624 } 3624 3625 } -
TabularUnified branches/SHM-dev/source/Lib/TLibCommon/TComUpsampleFilter.cpp ¶
r1502 r1503 430 430 pcTempPic->setHeight(heightBL << 1); 431 431 #endif 432 pcTempPic->extendPicBorder 432 pcTempPic->extendPicBorder(); // extend the border. 433 433 #if SCALABLE_REXT 434 434 pcTempPic->setHeight(heightEL * chromaVerScalingEL); -
TabularUnified branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.cpp ¶
r1502 r1503 275 275 } 276 276 277 rpcPic->create( vps,sps, pps, true, m_layerId);277 rpcPic->create( sps, pps, true, m_layerId); 278 278 #else //SVC_EXTENSION 279 279 rpcPic->create ( sps, pps, true); … … 324 324 } 325 325 326 rpcPic->create( vps,sps, pps, true, m_layerId);326 rpcPic->create( sps, pps, true, m_layerId); 327 327 #else //SVC_EXTENSION 328 328 rpcPic->create ( sps, pps, true); … … 520 520 UInt refLayerId = 0; 521 521 522 pBLPic->create( * vps, *sps, *pps, true, refLayerId);522 pBLPic->create( *sps, *pps, true, refLayerId); 523 523 524 524 // it is needed where the VPS is accessed through the slice 525 525 pBLPic->getSlice(0)->setVPS( vps ); 526 pBLPic->getPicSym()->inferSpsForNonHEVCBL( );526 pBLPic->getPicSym()->inferSpsForNonHEVCBL(vps); 527 527 pBLPic->getSlice(0)->setSPS( &pBLPic->getPicSym()->getSPS() ); 528 528 } … … 2273 2273 m_cIlpPic[j] = new TComPic; 2274 2274 2275 m_cIlpPic[j]->create(* vps, *sps, *slice->getPPS(), true, m_layerId);2275 m_cIlpPic[j]->create(*sps, *slice->getPPS(), true, m_layerId); 2276 2276 2277 2277 for (Int i=0; i<m_cIlpPic[j]->getPicSym()->getNumberOfCtusInFrame(); i++) -
TabularUnified branches/SHM-dev/source/Lib/TLibEncoder/TEncPic.cpp ¶
r1502 r1503 127 127 Void TEncPic::create( const TComVPS& vps, const TComSPS &sps, const TComPPS &pps, UInt uiMaxAdaptiveQPDepth, Bool bIsVirtual, const UInt layerId ) 128 128 { 129 TComPic::create( vps,sps, pps, bIsVirtual, layerId );129 TComPic::create( sps, pps, bIsVirtual, layerId ); 130 130 #else 131 131 Void TEncPic::create( const TComSPS &sps, const TComPPS &pps, UInt uiMaxAdaptiveQPDepth, Bool bIsVirtual ) -
TabularUnified branches/SHM-dev/source/Lib/TLibEncoder/TEncTop.cpp ¶
r1502 r1503 794 794 } 795 795 796 rpcPic->create( m_c VPS, m_cSPS, m_cPPS, false, m_layerId );796 rpcPic->create( m_cSPS, m_cPPS, false, m_layerId ); 797 797 #else //SVC_EXTENSION 798 798 rpcPic->create( m_cSPS, m_cPPS, false ); … … 1687 1687 { 1688 1688 m_cIlpPic[j] = new TComPic; 1689 m_cIlpPic[j]->create(m_c VPS, m_cSPS, m_cPPS, true, m_layerId);1689 m_cIlpPic[j]->create(m_cSPS, m_cPPS, true, m_layerId); 1690 1690 for (Int i=0; i<m_cIlpPic[j]->getPicSym()->getNumberOfCtusInFrame(); i++) 1691 1691 {
Note: See TracChangeset for help on using the changeset viewer.