Changeset 1503 in SHVCSoftware for branches


Ignore:
Timestamp:
11 Dec 2015, 19:35:23 (9 years ago)
Author:
seregin
Message:

remove VPS member from picture

Location:
branches/SHM-dev/source/Lib
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • TabularUnified branches/SHM-dev/source/Lib/TLibCommon/TComPic.cpp

    r1502 r1503  
    7777}
    7878#if SVC_EXTENSION
    79 Void TComPic::create( const TComVPS &vps, const TComSPS &sps, const TComPPS &pps, const Bool bIsVirtual, const UInt layerId )
     79Void TComPic::create( const TComSPS &sps, const TComPPS &pps, const Bool bIsVirtual, const UInt layerId )
    8080{
    8181  const ChromaFormat chromaFormatIDC = sps.getChromaFormatIdc();
     
    8989  m_layerId = layerId;
    9090
    91   m_picSym.create( vps, sps, pps, uiMaxDepth, layerId );
     91  m_picSym.create( sps, pps, uiMaxDepth, layerId );
    9292
    9393  if (!bIsVirtual)
  • TabularUnified branches/SHM-dev/source/Lib/TLibCommon/TComPic.h

    r1502 r1503  
    102102
    103103#if SVC_EXTENSION
    104   Void          create( const TComVPS& 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 );
    105105#else
    106106  Void          create( const TComSPS &sps, const TComPPS &pps, const Bool bIsVirtual /*= false*/ );
  • TabularUnified branches/SHM-dev/source/Lib/TLibCommon/TComPicSym.cpp

    r1502 r1503  
    4747// ====================================================================================================================
    4848
    49 #if SVC_EXTENSION
    50 TComVPS TComPicSym::m_vps;
    51 #endif
    52 
    5349TComPicSym::TComPicSym()
    5450:m_frameWidthInCtus(0)
     
    8278
    8379#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;
     80Void TComPicSym::create  ( const TComSPS &sps, const TComPPS &pps, UInt uiMaxDepth, const UInt layerId )
     81{
    8782#else
    8883Void TComPicSym::create  ( const TComSPS &sps, const TComPPS &pps, UInt uiMaxDepth )
     
    215210  m_apSlices.back()->setPPS(&m_pps);
    216211  m_apSlices.back()->setSPS(&m_sps);
    217 #if SVC_EXTENSION
    218   m_apSlices.back()->setVPS(&m_vps);
    219 #endif
    220212  if (m_apSlices.size()>=2)
    221213  {
  • TabularUnified branches/SHM-dev/source/Lib/TLibCommon/TComPicSym.h

    r1502 r1503  
    121121 
    122122#if SVC_EXTENSION
    123   // SHM: temporal solution to keep VPS with a picture, ideally it should be picture specific, but currently sizeof(TComVPS) = 86929196
    124   static TComVPS m_vps;
    125123#if N0383_IL_CONSTRAINED_TILE_SETS_SEI
    126124  Int*           m_piTileSetIdxMap;     //the map of the tile set index relative to LCU raster scan address
     
    132130public:
    133131#if SVC_EXTENSION
    134   Void               create  ( const TComVPS &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 );
    135133#if CGS_3D_ASYMLUT
    136134  TComPPS*           getPPSToUpdate()                                      { return &m_pps; }
     
    154152  const TComPPS&     getPPS()                 const                        { return m_pps; }
    155153
    156 #if SVC_EXTENSION
    157   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 #else
    159154  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 #endif
    161155  UInt               getNumAllocatedSlice() const                          { return UInt(m_apSlices.size());       }
    162156  Void               allocateNewSlice();
     
    194188    m_pbSkippedTileSetFlag[i]  = skipFlag;
    195189  }
    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);       }
    198192  Bool         getSkippedTileSetFlag( Int i )                        { return *(m_pbSkippedTileSetFlag + i); }
    199193#endif
    200   Void         inferSpsForNonHEVCBL()                                { m_sps.inferSPS(0, &m_vps); }
     194  Void         inferSpsForNonHEVCBL(TComVPS *vps)                    { m_sps.inferSPS(0, vps);              }
    201195#endif //SVC_EXTENSION
    202196
  • TabularUnified branches/SHM-dev/source/Lib/TLibCommon/TComSlice.cpp

    r1502 r1503  
    36203620    if( layerId == 0 && vps->getNonHEVCBaseLayerFlag() )
    36213621    {
    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);
    36233624    }
    36243625  }
  • TabularUnified branches/SHM-dev/source/Lib/TLibCommon/TComUpsampleFilter.cpp

    r1502 r1503  
    430430    pcTempPic->setHeight(heightBL << 1);
    431431#endif
    432     pcTempPic->extendPicBorder   (); // extend the border.
     432    pcTempPic->extendPicBorder(); // extend the border.
    433433#if SCALABLE_REXT
    434434    pcTempPic->setHeight(heightEL * chromaVerScalingEL);
  • TabularUnified branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.cpp

    r1502 r1503  
    275275    }
    276276
    277     rpcPic->create( vps, sps, pps, true, m_layerId);
     277    rpcPic->create( sps, pps, true, m_layerId);
    278278#else //SVC_EXTENSION
    279279    rpcPic->create ( sps, pps, true);
     
    324324  }
    325325
    326   rpcPic->create( vps, sps, pps, true, m_layerId);
     326  rpcPic->create( sps, pps, true, m_layerId);
    327327#else  //SVC_EXTENSION
    328328  rpcPic->create ( sps, pps, true);
     
    520520        UInt refLayerId = 0;
    521521
    522         pBLPic->create( *vps, *sps, *pps, true, refLayerId);
     522        pBLPic->create( *sps, *pps, true, refLayerId);
    523523
    524524        // it is needed where the VPS is accessed through the slice
    525525        pBLPic->getSlice(0)->setVPS( vps );
    526         pBLPic->getPicSym()->inferSpsForNonHEVCBL();
     526        pBLPic->getPicSym()->inferSpsForNonHEVCBL(vps);
    527527        pBLPic->getSlice(0)->setSPS( &pBLPic->getPicSym()->getSPS() );
    528528      }
     
    22732273        m_cIlpPic[j] = new  TComPic;
    22742274
    2275         m_cIlpPic[j]->create(*vps, *sps, *slice->getPPS(), true, m_layerId);
     2275        m_cIlpPic[j]->create(*sps, *slice->getPPS(), true, m_layerId);
    22762276
    22772277        for (Int i=0; i<m_cIlpPic[j]->getPicSym()->getNumberOfCtusInFrame(); i++)
  • TabularUnified branches/SHM-dev/source/Lib/TLibEncoder/TEncPic.cpp

    r1502 r1503  
    127127Void TEncPic::create( const TComVPS& vps, const TComSPS &sps, const TComPPS &pps, UInt uiMaxAdaptiveQPDepth, Bool bIsVirtual, const UInt layerId )
    128128{
    129   TComPic::create( vps, sps, pps, bIsVirtual, layerId );
     129  TComPic::create( sps, pps, bIsVirtual, layerId );
    130130#else
    131131Void TEncPic::create( const TComSPS &sps, const TComPPS &pps, UInt uiMaxAdaptiveQPDepth, Bool bIsVirtual )
  • TabularUnified branches/SHM-dev/source/Lib/TLibEncoder/TEncTop.cpp

    r1502 r1503  
    794794      }
    795795
    796       rpcPic->create( m_cVPS, m_cSPS, m_cPPS, false, m_layerId );
     796      rpcPic->create( m_cSPS, m_cPPS, false, m_layerId );
    797797#else  //SVC_EXTENSION
    798798      rpcPic->create( m_cSPS, m_cPPS, false );
     
    16871687      {
    16881688        m_cIlpPic[j] = new TComPic;
    1689         m_cIlpPic[j]->create(m_cVPS, m_cSPS, m_cPPS, true, m_layerId);
     1689        m_cIlpPic[j]->create(m_cSPS, m_cPPS, true, m_layerId);
    16901690        for (Int i=0; i<m_cIlpPic[j]->getPicSym()->getNumberOfCtusInFrame(); i++)
    16911691        {
Note: See TracChangeset for help on using the changeset viewer.