Changeset 1031 in SHVCSoftware for branches/SHM-dev/source/App/TAppEncoder

Timestamp:

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

Author:

seregin

Message:

fix convertToMonochrome

File:

• branches/SHM-dev/source/App/TAppEncoder/TAppEncTop.cpp (modified) (3 diffs)

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)