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

Timestamp:

10 Dec 2013, 13:50:12 (10 years ago)

Author:

tech

Message:

Merged HTM-9.0-dev0@731. (MV-HEVC 6 HLS)

File:

• trunk/source/App/TAppEncoder/TAppEncCfg.h (modified) (4 diffs)

trunk/source/App/TAppEncoder/TAppEncCfg.h

@@ -89 +89 @@
   Int                    m_vpsNumLayerSets;                   ///< Number of layer sets
   std::vector< std::vector<Int> > m_layerIdsInSets;           ///< LayerIds in vps of layer set 
+#if H_MV_6_PS_0109_25
+  Int                    m_defaultOneTargetOutputLayerIdc;    ///< Output highest layer of layer sets by default when equal to 1
+#else
   Bool                   m_defaultOneTargetOutputLayerFlag;   ///< Output highest layer of layer sets by default  
+#endif
   std::vector<Int>       m_outputLayerSetIdx;                 ///< Indices of layer sets used as additional output layer sets  
   std::vector< std::vector<Int> > m_layerIdsInAddOutputLayerSet; ///< LayerIds in vps of additional output layers
@@ -98 +102 @@
   std::vector< std::vector<Int> > m_dependencyTypes;          ///< Dependency types of direct reference layers
 
+#if H_MV_6_HRD_O0217_13
+  // DBP Size
+  Bool m_subLayerFlagInfoPresentFlag;
+#endif
+
   // VPS VUI
   Bool m_vpsVuiPresentFlag;
+#if H_MV_6_PS_O0223_29
+  Bool m_crossLayerPicTypeAlignedFlag;
+  Bool m_crossLayerIrapAlignedFlag;
+#endif
   Bool m_bitRatePresentVpsFlag;
   Bool m_picRatePresentVpsFlag;
@@ -108 +121 @@
   std::vector< std::vector<Int  > > m_constantPicRateIdc;
   std::vector< std::vector<Int  > > m_avgPicRate;
+#if H_MV_6_O0226_37
+  Bool                              m_tilesNotInUseFlag; 
+  std::vector< Bool >               m_tilesInUseFlag;
+  std::vector< Bool >               m_loopFilterNotAcrossTilesFlag; 
+  Bool                              m_wppNotInUseFlag;
+  std::vector< Bool >               m_wppInUseFlag;
+
+#endif
   std::vector< std::vector<Bool > > m_tileBoundariesAlignedFlag;  
   Bool m_ilpRestrictedRefLayersFlag;
@@ -175 +196 @@
   
   // coding structure
+#if H_MV_LAYER_WISE_STARTUP
+  std::vector<Int> m_iIntraPeriod;                            ///< period of I-slice (random access period)
+#else
   Int       m_iIntraPeriod;                                   ///< period of I-slice (random access period)
+#endif
   Int       m_iDecodingRefreshType;                           ///< random access type
   Int       m_iGOPSize;                                       ///< GOP size of hierarchical structure