Changeset 1031 in SHVCSoftware

Timestamp:

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

Author:

seregin

Message:

fix convertToMonochrome

Location:

branches/SHM-dev/source

Files:

• App/TAppEncoder/TAppEncTop.cpp (modified) (3 diffs)
• Lib/TLibCommon/TComPicYuv.cpp (modified) (1 diff)
• Lib/TLibCommon/TypeDef.h (modified) (1 diff)

branches/SHM-dev/source/App/TAppEncoder/TAppEncTop.cpp

@@ -1415 +1415 @@
   
 #if AUXILIARY_PICTURES
-  if (m_scalabilityMask[3])
+  if (m_scalabilityMask[AUX_ID])
   {
     UInt maxAuxId = 0;
     UInt auxDimIdLen = 1;
+    Int  auxId = vps->getNumScalabilityTypes() - 1;
     for(i = 1; i < vps->getMaxLayers(); i++)
     {
@@ -1430 +1431 @@
       auxDimIdLen++;
     }
-    vps->setDimensionIdLen(1, auxDimIdLen);
+    vps->setDimensionIdLen(auxId, auxDimIdLen);
     for(i = 1; i < vps->getMaxLayers(); i++)
     {
-      vps->setDimensionId(i, 1, m_acLayerCfg[i].getAuxId());
+      vps->setDimensionId(i, auxId, m_acLayerCfg[i].getAuxId());
     }
   }
@@ -2139 +2140 @@
 #if R0062_AUX_PSEUDO_MONOCHROME
         if ( m_acLayerCfg[layer].getChromaFormatIDC() == CHROMA_400 ||
-             (m_apcTEncTop[0]->getVPS()->getScalabilityMask(3) && (m_acLayerCfg[layer].getAuxId() == 1 || m_acLayerCfg[layer].getAuxId() == 2)) )
+             (m_apcTEncTop[0]->getVPS()->getScalabilityMask(AUX_ID) && (m_acLayerCfg[layer].getAuxId() == AUX_ALPHA || m_acLayerCfg[layer].getAuxId() == AUX_DEPTH)) )
 #else
         if (m_acLayerCfg[layer].getChromaFormatIDC() == CHROMA_400)

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