Changeset 1225 in SHVCSoftware

Timestamp:

9 Jul 2015, 00:15:08 (9 years ago)

Author:

seregin

Message:

macro cleanup: R0062_AUX_PSEUDO_MONOCHROME

Location:

branches/SHM-dev/source

Files:

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

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

@@ -4193 +4193 @@
   if( layerIdx < MAX_LAYERS-1 )
   {
-#if R0062_AUX_PSEUDO_MONOCHROME
     xConfirmPara(m_acLayerCfg[layerIdx].m_auxId < 0 || m_acLayerCfg[layerIdx].m_auxId > 2, "AuxId must be in range 0 to 2");
-#else
-    xConfirmPara(m_acLayerCfg[layerIdx].m_auxId < 0 || m_acLayerCfg[layerIdx].m_auxId > 4, "AuxId must be in range 0 to 4");
-    xConfirmPara(m_acLayerCfg[layerIdx].m_auxId > 0 && m_acLayerCfg[layerIdx].m_chromaFormatIDC != CHROMA_400, "Auxiliary picture must be monochrome picture");
-#endif
   }
 #endif 

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

@@ -1748 +1748 @@
 
 #if AUXILIARY_PICTURES
-#if R0062_AUX_PSEUDO_MONOCHROME
-        if ( m_acLayerCfg[layer].getChromaFormatIDC() == CHROMA_400 ||
-             (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)
-#endif
+        if( m_acLayerCfg[layer].getChromaFormatIDC() == CHROMA_400 || (m_apcTEncTop[0]->getVPS()->getScalabilityMask(AUX_ID) && (m_acLayerCfg[layer].getAuxId() == AUX_ALPHA || m_acLayerCfg[layer].getAuxId() == AUX_DEPTH)) )
         {
           pcPicYuvOrg[layer]->convertToMonochrome();

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

@@ -63 +63 @@
 #define REF_IDX_MFM                      1      ///< JCTVC-L0336: motion vector mapping of inter-layer reference picture
 #define AUXILIARY_PICTURES               1      ///< JCTVC-O0041: auxiliary picture layers
-#define R0062_AUX_PSEUDO_MONOCHROME      1      ///> JCVVC-R0063: pseudo monochrome for auxiliary pictures
 #define NO_CLRAS_OUTPUT_FLAG             1
 #define P0138_USE_ALT_CPB_PARAMS_FLAG    1      ///< JCTVC-P0138: use_alt_cpb_params_flag syntax in buffering period SEI message extension