Changeset 1235 in SHVCSoftware for branches/SHM-dev/source/App/TAppEncoder/TAppEncLayerCfg.h

Timestamp:

13 Jul 2015, 20:38:11 (9 years ago)

Author:

seregin

Message:

port rev 4219 and rev 4246

File:

• branches/SHM-dev/source/App/TAppEncoder/TAppEncLayerCfg.h (modified) (3 diffs)

branches/SHM-dev/source/App/TAppEncoder/TAppEncLayerCfg.h

@@ -60 +60 @@
   Int       m_numActiveRefLayers;
 
-#if LAYER_CTB
+  Int       m_iMaxCuDQPDepth;                                 ///< Max. depth for a minimum CuDQPSize (0:default)
+
   // coding unit (CU) definition
   UInt      m_uiMaxCUWidth;                                   ///< max. CU width in pixel
@@ -72 +73 @@
   UInt      m_uiQuadtreeTUMaxDepthInter;
   UInt      m_uiQuadtreeTUMaxDepthIntra;
-#endif
 
 #if RC_SHVC_HARMONIZATION
@@ -86 +86 @@
   Int       m_maxTidIlRefPicsPlus1;
   Int       m_waveFrontSynchro;                   ///< 0: no WPP. >= 1: WPP is enabled, the "Top right" from which inheritance occurs is this LCU offset in the line above the current.
-  Int       m_iWaveFrontSubstreams;               ///< If iWaveFrontSynchro, this is the number of substreams per frame (dependent tiles) or per tile (independent tiles).
 
   Int       m_iQP;                                            ///< QP value of key-picture (integer)