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

Timestamp:

11 Sep 2013, 14:40:25 (12 years ago)

Author:

tech

Message:

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

File:

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

trunk/source/App/TAppEncoder/TAppEncCfg.h

@@ -69 +69 @@
   std::vector<char*>     m_pchReconFileList;                  ///< output reconstruction file names
   Int                    m_numberOfLayers;                    ///< number of Layers to Encode
+#if H_MV5
+  Int                    m_iNumberOfViews;                    ///< number of Layers that are views
+#else
 #if H_3D
   Int                    m_iNumberOfViews;                    ///< number of Layers that are views
+#endif
 #endif
 #else
@@ -79 +83 @@
   std::vector< std::vector<Int> > m_dimIds;                   ///< dimension ids ( pointers to m_viewId and m_depthFlag 
   std::vector<Int>       m_viewId;                            ///< view id
+#if H_MV5
+  std::vector<Int>       m_viewOrderIndex;                    ///< view order index  
+#endif
 #if H_3D
   std::vector<Int>       m_depthFlag;                         ///< depth flag
@@ -99 +106 @@
   std::vector< std::vector<Int> > m_dependencyTypes;          ///< Dependency types of direct reference layers
 
+#if H_MV5
+  // VPS VUI
+  Bool m_vpsVuiPresentFlag;
+  Bool m_bitRatePresentVpsFlag;
+  Bool m_picRatePresentVpsFlag;
+  std::vector< std::vector<Bool > > m_bitRatePresentFlag;
+  std::vector< std::vector<Bool > > m_picRatePresentFlag;
+  std::vector< std::vector<Int  > > m_avgBitRate;
+  std::vector< std::vector<Int  > > m_maxBitRate;
+  std::vector< std::vector<Int  > > m_constantPicRateIdc;
+  std::vector< std::vector<Int  > > m_avgPicRate;
+  std::vector< std::vector<Bool > > m_tileBoundariesAlignedFlag;  
+  Bool m_ilpRestrictedRefLayersFlag;
+  std::vector< std::vector<Int  > > m_minSpatialSegmentOffsetPlus1;
+  std::vector< std::vector<Bool > > m_ctuBasedOffsetEnabledFlag;
+  std::vector< std::vector<Int  > > m_minHorizontalCtuOffsetPlus1;
+#endif
+
 #if H_3D_IV_MERGE
   Bool                   m_ivMvPredFlag;                      ///< Interview motion vector prediction 
@@ -115 +140 @@
   Bool m_viewSynthesisPredFlag;
 #endif
-#if H_3D_TMVP
+#if H_3D
   Bool m_ivMvScalingFlag; 
 #endif