Changeset 1284 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibEncoder

Timestamp:

17 Jul 2015, 00:34:10 (9 years ago)

Author:

seregin

Message:

port rev 4319 (g_PCMBitDepth)

Location:

branches/SHM-dev/source/Lib/TLibEncoder

Files:

• TEncCfg.h (modified) (4 diffs)
• TEncTop.cpp (modified) (2 diffs)

branches/SHM-dev/source/Lib/TLibEncoder/TEncCfg.h

@@ -212 +212 @@
   Bool      m_bUseConstrainedIntraPred;
   Bool      m_usePCM;
+  Int       m_PCMBitDepth[MAX_NUM_CHANNEL_TYPE];
   UInt      m_pcmLog2MaxSize;
   UInt      m_uiPCMLog2MinSize;
@@ -223 +224 @@
 
   Bool      m_bPCMInputBitDepthFlag;
-  UInt      m_uiPCMBitDepthLuma;
-  UInt      m_uiPCMBitDepthChroma;
   Bool      m_bPCMFilterDisableFlag;
   Bool      m_disableIntraReferenceSmoothing;
@@ -458 +457 @@
   , m_colourRemapSEIFileRoot(NULL)
 #endif
-  {}
+  {
+    m_PCMBitDepth[CHANNEL_TYPE_LUMA]=8;
+    m_PCMBitDepth[CHANNEL_TYPE_CHROMA]=8;
+  }
 
   virtual ~TEncCfg()
@@ -614 +616 @@
   Void      setPCMFilterDisableFlag         ( Bool  b )     {  m_bPCMFilterDisableFlag = b; }
   Void      setUsePCM                       ( Bool  b )     {  m_usePCM = b;               }
+  Void      setPCMBitDepth( const ChannelType chType, Int pcmBitDepthForChannel ) { m_PCMBitDepth[chType] = pcmBitDepthForChannel; }
   Void      setPCMLog2MaxSize               ( UInt u )      { m_pcmLog2MaxSize = u;      }
   Void      setPCMLog2MinSize               ( UInt u )     { m_uiPCMLog2MinSize = u;      }

branches/SHM-dev/source/Lib/TLibEncoder/TEncTop.cpp

@@ -901 +901 @@
 
   m_cSPS.setMaxTrSize   ( 1 << m_uiQuadtreeTULog2MaxSize );
-  
+
   m_cSPS.setUseAMP ( m_useAMP );
 
@@ -913 +913 @@
     m_cSPS.setQpBDOffset  (ChannelType(channelType), (6 * (g_bitDepth[channelType] - 8)));
 #endif
-    m_cSPS.setPCMBitDepth (ChannelType(channelType), g_PCMBitDepth[channelType]         );
+    m_cSPS.setPCMBitDepth (ChannelType(channelType), m_PCMBitDepth[channelType]         );
   }