Changeset 1031 in SHVCSoftware for branches/SHM-dev/source/Lib

Timestamp:

27 Feb 2015, 01:16:03 (11 years ago)

Author:

seregin

Message:

fix convertToMonochrome

Location:

branches/SHM-dev/source/Lib/TLibCommon

Files:

• TComPicYuv.cpp (modified) (1 diff)
• TypeDef.h (modified) (1 diff)

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

@@ -330 +330 @@
 Void TComPicYuv::convertToMonochrome()
 {
-  Int numPix = ((m_iPicWidth >> 1) + (m_iMarginX << 1)) * ((m_iPicHeight >> 1) + (m_iMarginY << 1));
   Pel grayVal = (1 << (g_bitDepth[CHANNEL_TYPE_CHROMA] - 1));
 
-  for (UInt i = 0; i < numPix; i++)
-  {
-    m_apiPicBuf[COMPONENT_Cb][i] = grayVal;
-    m_apiPicBuf[COMPONENT_Cr][i] = grayVal;
+  for( UInt comp = 1; comp < getNumberValidComponents(); comp++ )
+  {
+    const ComponentID ch=ComponentID(comp);
+    for( UInt i = 0; i < getStride(ch) * getTotalHeight(ch); i++ )
+    {
+      m_apiPicBuf[ch][i] = grayVal;
+    }
   }
 }

branches/SHM-dev/source/Lib/TLibCommon/TypeDef.h

@@ -305 +305 @@
 };
 
+enum AuxType
+{
+  AUX_ALPHA = 1,
+  AUX_DEPTH = 2,
+};
+
 /// normative encoder constraints --------
 #define MFM_ENCCONSTRAINT                1      ///< JCTVC-O0216: Encoder constraint for motion field mapping