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

Timestamp:

26 Feb 2015, 00:21:54 (10 years ago)

Author:

seregin

Message:

merge with SHM-upgrade branch

Location:

branches/SHM-dev

Files:

• . (modified) (1 prop)
• source (modified) (1 prop)
• source/App/TAppEncoder/TAppEncLayerCfg.h (modified) (6 diffs)

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

@@ -10 +10 @@
 #include "TLibEncoder/TEncCfg.h"
 #include <sstream>
+#include <iomanip>
 
 using namespace std;
@@ -42 +43 @@
   Int       m_iIntraPeriod;                                   ///< period of I-slice (random access period)
   Double    m_fQP;                                            ///< QP value of key-picture (floating point)
+  ChromaFormat m_chromaFormatIDC;
+  ChromaFormat m_InputChromaFormatIDC;
+  ChromaFormat m_chromaFormatConstraint;
+  UInt      m_bitDepthConstraint;
+  Bool      m_intraConstraintFlag;
+  Bool      m_lowerBitRateConstraintFlag;
 #if AUXILIARY_PICTURES
-  ChromaFormat m_chromaFormatIDC;
-  ChromaFormat m_InputChromaFormat;
-  Int          m_auxId;
+  Int       m_auxId;
 #endif
 #if VPS_EXTN_DIRECT_REF_LAYERS
@@ -88 +93 @@
   Int*      m_aidQP;                                          ///< array of slice QP values
   TAppEncCfg* m_cAppEncCfg;                                   ///< pointer to app encoder config
-  Int       m_numScaledRefLayerOffsets  ;
+  Int       m_numScaledRefLayerOffsets;
 #if O0098_SCALED_REF_LAYER_ID
   Int       m_scaledRefLayerId          [MAX_LAYERS];
@@ -115 +120 @@
 #endif
 
-#if O0194_DIFFERENT_BITDEPTH_EL_BL
-  Int       m_inputBitDepthY;                               ///< bit-depth of input file (luma component)
-  Int       m_inputBitDepthC;                               ///< bit-depth of input file (chroma component)
-  Int       m_internalBitDepthY;                            ///< bit-depth codec operates at in luma (input/output files will be converted)
-  Int       m_internalBitDepthC;                            ///< bit-depth codec operates at in chroma (input/output files will be converted)
-  Int       m_outputBitDepthY;                              ///< bit-depth of output file (luma component)
-  Int       m_outputBitDepthC;                              ///< bit-depth of output file (chroma component)
-#endif
+  Int       m_inputBitDepth   [MAX_NUM_CHANNEL_TYPE];         ///< bit-depth of input file
+  Int       m_outputBitDepth  [MAX_NUM_CHANNEL_TYPE];         ///< bit-depth of output file
+  Int       m_MSBExtendedBitDepth[MAX_NUM_CHANNEL_TYPE];      ///< bit-depth of input samples after MSB extension
+  Int       m_internalBitDepth[MAX_NUM_CHANNEL_TYPE];         ///< bit-depth codec operates at (input/output files will be converted)
+  UInt      m_saoOffsetBitShift[MAX_NUM_CHANNEL_TYPE];
+  Bool      m_useExtendedPrecision;
+  Bool      m_useHighPrecisionPredictionWeighting;
+
 #if REPN_FORMAT_IN_VPS
   Int       m_repFormatIdx;
@@ -154 +159 @@
 #endif
 
+#if MULTIPLE_PTL_SUPPORT
+  // profile/level
+  Int       m_layerPTLIdx;
+#endif
+
 public:
   TAppEncLayerCfg();
@@ -182 +192 @@
   Int     getConfWinBottom()          {return m_confWinBottom;       }
 #if AUXILIARY_PICTURES
-  ChromaFormat getInputChromaFormat()   {return m_InputChromaFormat;}
+  ChromaFormat getInputChromaFormat()   {return m_InputChromaFormatIDC;}
   ChromaFormat getChromaFormatIDC()     {return m_chromaFormatIDC;  }
   Int          getAuxId()               {return m_auxId;            }