Changeset 77 in 3DVCSoftware for trunk/source/Lib/TLibCommon/TComSlice.cpp


Ignore:
Timestamp:
14 Jun 2012, 16:38:29 (12 years ago)
Author:
tech
Message:

Merged with branch/HTM-3.0Samsung REV74 including:

  • restricted residual prediction m24766
  • Inter-view residual prediction m24938
  • VPS concept m24714,m24878, m24945,m24896, m2491
  • reference list modification, restriction on IDR m24876, m24874
  • depth based motion parameter prediction m24829

Fixed bugs:

  • interview prediction
  • VSO

Added:

  • xcode project
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/Lib/TLibCommon/TComSlice.cpp

    r61 r77  
    13051305}
    13061306
     1307// ------------------------------------------------------------------------------------------------
     1308// Video parameter set (VPS)
     1309// ------------------------------------------------------------------------------------------------
     1310#if VIDYO_VPS_INTEGRATION
     1311TComVPS::TComVPS()
     1312: m_VPSId                     (  0)
     1313, m_uiMaxTLayers              (  1)
     1314, m_uiMaxLayers               (  1)
     1315, m_bTemporalIdNestingFlag    (false)
     1316, m_uiExtensionType           (  0)
     1317{
     1318  for( Int i = 0; i < MAX_LAYER_NUM; i++)
     1319  {
     1320    m_uiDependentLayer[i] = i? i-1: 0;
     1321    m_bDependentFlag[i] = false;
     1322    m_uiViewId[i] = 0;
     1323    m_bDepthFlag[i] = 0;
     1324    m_iViewOrderIdx[i] = 0;
     1325  }
     1326 
     1327  for( Int i = 0; i < MAX_TLAYER; i++)
     1328  {
     1329    m_numReorderPics[i] = 0;
     1330    m_uiMaxDecPicBuffering[i] = 0;
     1331    m_uiMaxLatencyIncrease[i] = 0;
     1332  }
     1333}
     1334
     1335TComVPS::~TComVPS()
     1336{
     1337       
     1338       
     1339}
     1340
     1341#endif
     1342
    13071343
    13081344// ------------------------------------------------------------------------------------------------
     
    13111347
    13121348TComSPS::TComSPS()
     1349#if VIDYO_VPS_INTEGRATION
     1350: m_VPSId                     (  0)
     1351, m_SPSId                     (  0)
     1352#else
    13131353: m_SPSId                     (  0)
     1354#endif
    13141355, m_ProfileIdc                (  0)
    13151356, m_LevelIdc                  (  0)
     
    21552196, m_ppsMap(MAX_NUM_PPS)
    21562197, m_apsMap(MAX_NUM_APS)
     2198#if VIDYO_VPS_INTEGRATION
     2199, m_vpsMap(MAX_NUM_VPS)
     2200#endif
    21572201{
    21582202}
Note: See TracChangeset for help on using the changeset viewer.