Changeset 122 in SHVCSoftware for branches


Ignore:
Timestamp:
12 Apr 2013, 02:09:46 (12 years ago)
Author:
seregin
Message:

making VPS static

Location:
branches/HM-10.0-dev-SHM/source
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • branches/HM-10.0-dev-SHM/source/App/TAppEncoder/TAppEncTop.cpp

    r119 r122  
    7575Void TAppEncTop::xInitLibCfg()
    7676{
    77   TComVPS vps;
    78 
    79   vps.setMaxTLayers                       ( m_maxTempLayer );
     77  TComVPS* vps = m_acTEncTop[0].getVPS();
     78
     79  vps->setMaxTLayers                       ( m_maxTempLayer );
    8080  if (m_maxTempLayer == 1)
    8181  {
    82     vps.setTemporalNestingFlag(true);
     82    vps->setTemporalNestingFlag(true);
    8383  }
    8484#if !VPS_RENAME
    … …  
    8787  for(Int i = 0; i < MAX_TLAYER; i++)
    8888  {
    89     vps.setNumReorderPics                 ( m_numReorderPics[i], i );
    90     vps.setMaxDecPicBuffering             ( m_maxDecPicBuffering[i], i );
     89    vps->setNumReorderPics                 ( m_numReorderPics[i], i );
     90    vps->setMaxDecPicBuffering             ( m_maxDecPicBuffering[i], i );
    9191  }
    9292
    9393  for(UInt layer=0; layer<m_numLayers; layer++)
    9494  {
    95     m_acTEncTop[layer].setVPS(&vps);
     95    //m_acTEncTop[layer].setVPS(&vps);
    9696    m_acTEncTop[layer].setFrameRate                    ( m_acLayerCfg[layer].getFrameRate() );
    9797    m_acTEncTop[layer].setFrameSkip                    ( m_FrameSkip );

  • branches/HM-10.0-dev-SHM/source/Lib/TLibEncoder/TEncCfg.h

    r118 r122  
    267267  Bool      m_TransquantBypassEnableFlag;                     ///< transquant_bypass_enable_flag setting in PPS.
    268268  Bool      m_CUTransquantBypassFlagValue;                    ///< if transquant_bypass_enable_flag, the fixed value to use for the per-CU cu_transquant_bypass_flag.
    269   TComVPS                    m_cVPS;
     269  static TComVPS                    m_cVPS;
    270270  Bool      m_recalculateQPAccordingToLambda;                 ///< recalculate QP value according to the lambda value
    271271  Int       m_activeParameterSetsSEIEnabled;                  ///< enable active parameter set SEI message

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

    r107 r122  
    4848Int TEncTop::m_iSPSIdCnt = 0;
    4949Int TEncTop::m_iPPSIdCnt = 0;
     50TComVPS TEncCfg::m_cVPS;
    5051#endif
    5152
Note: See TracChangeset for help on using the changeset viewer.