Changeset 1287 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibCommon/TComPicYuv.cpp

Timestamp:

17 Jul 2015, 05:43:37 (9 years ago)

Author:

seregin

Message:

port rev 4322 (g_bitDepth)

File:

• branches/SHM-dev/source/Lib/TLibCommon/TComPicYuv.cpp (modified) (4 diffs)

branches/SHM-dev/source/Lib/TLibCommon/TComPicYuv.cpp

@@ -256 +256 @@
 
 // NOTE: This function is never called, but may be useful for developers.
-Void TComPicYuv::dump (const Char* pFileName, Bool bAdd) const
+Void TComPicYuv::dump (const Char* pFileName, const BitDepths &bitDepths, Bool bAdd) const
 {
   FILE* pFile;
@@ -272 +272 @@
   {
     const ComponentID  ch     = ComponentID(chan);
-    const Int          shift  = g_bitDepth[toChannelType(ch)] - 8;
+    const Int          shift  = bitDepths.recon[toChannelType(ch)] - 8;
     const Int          offset = (shift>0)?(1<<(shift-1)):0;
     const Pel         *pi     = getAddr(ch);
@@ -307 +307 @@
   if( bitDepth == 8 )
   {
-    dump( pFileName, bAdd );
+    dump( pFileName, bitDepth, bAdd );
     return;
   }
@@ -338 +338 @@
 
 #if AUXILIARY_PICTURES
-Void TComPicYuv::convertToMonochrome()
-{
-  Pel grayVal = (1 << (g_bitDepth[CHANNEL_TYPE_CHROMA] - 1));
+Void TComPicYuv::convertToMonochrome(Int bitDepthChroma)
+{
+  Pel grayVal = (1 << (bitDepthChroma - 1));
 
   for( UInt comp = 1; comp < getNumberValidComponents(); comp++ )