Changeset 622 in 3DVCSoftware for trunk/source/App/TAppEncoder/TAppEncCfg.h


Ignore:
Timestamp:
11 Sep 2013, 14:40:25 (11 years ago)
Author:
tech
Message:

Merged 8.0-dev0@621 (MV-HEVC 5 HLS).

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/App/TAppEncoder/TAppEncCfg.h

    r608 r622  
    6969  std::vector<char*>     m_pchReconFileList;                  ///< output reconstruction file names
    7070  Int                    m_numberOfLayers;                    ///< number of Layers to Encode
     71#if H_MV5
     72  Int                    m_iNumberOfViews;                    ///< number of Layers that are views
     73#else
    7174#if H_3D
    7275  Int                    m_iNumberOfViews;                    ///< number of Layers that are views
     76#endif
    7377#endif
    7478#else
     
    7983  std::vector< std::vector<Int> > m_dimIds;                   ///< dimension ids ( pointers to m_viewId and m_depthFlag
    8084  std::vector<Int>       m_viewId;                            ///< view id
     85#if H_MV5
     86  std::vector<Int>       m_viewOrderIndex;                    ///< view order index 
     87#endif
    8188#if H_3D
    8289  std::vector<Int>       m_depthFlag;                         ///< depth flag
     
    99106  std::vector< std::vector<Int> > m_dependencyTypes;          ///< Dependency types of direct reference layers
    100107
     108#if H_MV5
     109  // VPS VUI
     110  Bool m_vpsVuiPresentFlag;
     111  Bool m_bitRatePresentVpsFlag;
     112  Bool m_picRatePresentVpsFlag;
     113  std::vector< std::vector<Bool > > m_bitRatePresentFlag;
     114  std::vector< std::vector<Bool > > m_picRatePresentFlag;
     115  std::vector< std::vector<Int  > > m_avgBitRate;
     116  std::vector< std::vector<Int  > > m_maxBitRate;
     117  std::vector< std::vector<Int  > > m_constantPicRateIdc;
     118  std::vector< std::vector<Int  > > m_avgPicRate;
     119  std::vector< std::vector<Bool > > m_tileBoundariesAlignedFlag; 
     120  Bool m_ilpRestrictedRefLayersFlag;
     121  std::vector< std::vector<Int  > > m_minSpatialSegmentOffsetPlus1;
     122  std::vector< std::vector<Bool > > m_ctuBasedOffsetEnabledFlag;
     123  std::vector< std::vector<Int  > > m_minHorizontalCtuOffsetPlus1;
     124#endif
     125
    101126#if H_3D_IV_MERGE
    102127  Bool                   m_ivMvPredFlag;                      ///< Interview motion vector prediction
     
    115140  Bool m_viewSynthesisPredFlag;
    116141#endif
    117 #if H_3D_TMVP
     142#if H_3D
    118143  Bool m_ivMvScalingFlag;
    119144#endif
Note: See TracChangeset for help on using the changeset viewer.