Ignore:
Timestamp:
14 Sep 2015, 19:41:29 (9 years ago)
Author:
tech
Message:

Integrated general SEI changes and following SEIs:

  • Multiview view position SEI
  • Multiview acquisition information SEI
  • Multiview scene information SEI
  • Inter-layer constrained tile sets SEI
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/HTM-15.1-dev0/source/App/TAppEncoder/TAppEncCfg.h

    r1313 r1328  
    7777// VPS specification
    7878  IntAry2d m_dimIds;                   ///< dimension ids ( pointers to m_viewId and m_depthFlag
    79   std::vector<Int>       m_viewId;                            ///< view id
    80   std::vector<Int>       m_viewOrderIndex;                    ///< view order index 
    81   std::vector<Int>       m_auxId;                             ///< auxiliary id
     79  IntAry1d               m_viewId;                            ///< view id
     80  IntAry1d               m_viewOrderIndex;                    ///< view order index 
     81  IntAry1d               m_auxId;                             ///< auxiliary id
    8282#if NH_3D
    83   std::vector<Int>       m_depthFlag;                         ///< depth flag
    84 #endif
    85   std::vector<Int>       m_targetEncLayerIdList;              ///< layer Ids in Nuh to be encoded
    86   std::vector<Int>       m_layerIdInNuh;                      ///< layer Id in Nuh for each layer
     83  IntAry1d               m_depthFlag;                         ///< depth flag
     84#endif
     85  IntAry1d               m_targetEncLayerIdList;              ///< layer Ids in Nuh to be encoded
     86  IntAry1d               m_layerIdInNuh;                      ///< layer Id in Nuh for each layer
    8787  Bool                   m_splittingFlag;                     ///< Splitting Flag
    8888  Int                    m_scalabilityMask;                   ///< Mask indicating scalabilities, 1: texture; 3: texture + depth                                                               
    89   std::vector<Int>       m_dimensionIdLen;                    ///< Length of scalability dimension s
     89  IntAry1d               m_dimensionIdLen;                    ///< Length of scalability dimension s
    9090 
    9191// layer sets   
     
    9595  IntAry2d m_highestLayerIdxPlus1;      ///< HighestLayerIdxPlus1 for each additional layer set and each independent layer (value with index 0 will be ignored)
    9696  Int                    m_defaultOutputLayerIdc;             ///< Specifies output layers of layer sets, 0: output all layers, 1: output highest layers, 2: specified by LayerIdsInDefOuputLayerSet
    97   std::vector<Int>       m_outputLayerSetIdx;                 ///< Indices of layer sets used as additional output layer sets 
     97  IntAry1d               m_outputLayerSetIdx;                 ///< Indices of layer sets used as additional output layer sets 
    9898  IntAry2d m_layerIdsInAddOutputLayerSet; ///< LayerIds in vps of additional output layers
    9999  IntAry2d m_layerIdsInDefOutputLayerSet; ///< Indices in vps of output layers in layer sets
    100100  IntAry2d               m_profileTierLevelIdx;      ///< Indices of of profile, per layer in layer set
    101   std::vector<Bool>      m_altOutputLayerFlag;                ///< Alt output layer flag
     101  BoolAry1d              m_altOutputLayerFlag;                ///< Alt output layer flag
    102102
    103103  // Dependencies
     
    112112  Bool m_bitRatePresentVpsFlag;
    113113  Bool m_picRatePresentVpsFlag;
    114   std::vector< std::vector<Bool > > m_bitRatePresentFlag;
    115   std::vector< std::vector<Bool > > m_picRatePresentFlag;
    116   std::vector< std::vector<Int  > > m_avgBitRate;
    117   std::vector< std::vector<Int  > > m_maxBitRate;
    118   std::vector< std::vector<Int  > > m_constantPicRateIdc;
    119   std::vector< std::vector<Int  > > m_avgPicRate;
     114  BoolAry2d              m_bitRatePresentFlag;
     115  BoolAry2d              m_picRatePresentFlag;
     116  IntAry2d              m_avgBitRate;
     117  IntAry2d              m_maxBitRate;
     118  IntAry2d              m_constantPicRateIdc;
     119  IntAry2d              m_avgPicRate;
    120120  Bool                              m_tilesNotInUseFlag;
    121121  BoolAry1d               m_tilesInUseFlag;
     
    124124  BoolAry1d               m_wppInUseFlag;
    125125
    126   std::vector< std::vector<Bool > > m_tileBoundariesAlignedFlag; 
     126  BoolAry2d              m_tileBoundariesAlignedFlag; 
    127127  Bool m_ilpRestrictedRefLayersFlag;
    128   std::vector< std::vector<Int  > > m_minSpatialSegmentOffsetPlus1;
    129   std::vector< std::vector<Bool > > m_ctuBasedOffsetEnabledFlag;
    130   std::vector< std::vector<Int  > > m_minHorizontalCtuOffsetPlus1;
     128  IntAry2d              m_minSpatialSegmentOffsetPlus1;
     129  BoolAry2d              m_ctuBasedOffsetEnabledFlag;
     130  IntAry2d              m_minHorizontalCtuOffsetPlus1;
    131131  Bool m_singleLayerForNonIrapFlag;
    132132  Bool m_higherLayerIrapSkipFlag;
     
    195195  // coding structure
    196196#if NH_MV
    197   std::vector<Int> m_iIntraPeriod;                            ///< period of I-slice (random access period)
     197  IntAry1d m_iIntraPeriod;                            ///< period of I-slice (random access period)
    198198#else
    199199  Int       m_iIntraPeriod;                                   ///< period of I-slice (random access period)
     
    256256#endif
    257257  TComSEIMasteringDisplay m_masteringDisplay;
     258#if NH_MV_SEI
     259  std::vector<char*>     m_seiCfgFileNames;               ///< SEI message files.
     260  SEIMessages            m_seiMessages;                       ///< Buffer for SEI messages.
     261#endif
    258262
    259263  Bool      m_bUseAdaptiveQP;                                 ///< Flag for enabling QP adaptation based on a psycho-visual model
     
    509513  UInt        m_summaryVerboseness;                           ///< Specifies the level of the verboseness of the text output.
    510514#if NH_MV
     515#if !NH_MV_SEI
    511516  Bool              m_subBistreamPropSEIEnabled;
    512517  Int               m_sbPropNumAdditionalSubStreams;
    513   std::vector<Int>  m_sbPropSubBitstreamMode;
    514   std::vector<Int>  m_sbPropOutputLayerSetIdxToVps;
    515   std::vector<Int>  m_sbPropHighestSublayerId;
    516   std::vector<Int>  m_sbPropAvgBitRate;
    517   std::vector<Int>  m_sbPropMaxBitRate;
     518  IntAry1d          m_sbPropSubBitstreamMode;
     519  IntAry1d          m_sbPropOutputLayerSetIdxToVps;
     520  IntAry1d          m_sbPropHighestSublayerId;
     521  IntAry1d          m_sbPropAvgBitRate;
     522  IntAry1d          m_sbPropMaxBitRate;
     523#endif
    518524  Bool              m_outputVpsInfo;
    519525#endif
     
    654660  Void xPrintVectorElem( Double elem ) { printf(" %5.2f", elem            );}; 
    655661  Void xPrintVectorElem( Bool   elem ) { printf(" %d"   , ( elem ? 1 : 0 ));};
     662#if NH_MV_SEI
     663  Void xParseSeiCfg();
     664#endif
    656665#endif
    657666#if NH_MV
Note: See TracChangeset for help on using the changeset viewer.