Changeset 910 in SHVCSoftware for branches/SHM-dev/source

Timestamp:

21 Oct 2014, 13:03:58 (10 years ago)

Author:

nokia

Message:

JCTVC-R0062 pseudo-monochrome for auxiliary pictures.

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

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

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

@@ -2029 +2029 @@
 
 #if AUXILIARY_PICTURES
+#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)) )
+#else
         if (m_acLayerCfg[layer].getChromaFormatIDC() == CHROMA_400)
+#endif
         {
           pcPicYuvOrg[layer]->convertToMonochrome();

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

@@ -213 +213 @@
 #define O0215_PHASE_ALIGNMENT            1      ///< JCTVC_O0215: signal a flag to specify phase alignment case, 0: zero-position-aligned, 1: central-position-aligned,
 #define AUXILIARY_PICTURES               1      ///< JCTVC-O0041: auxiliary picture layers
+#define R0062_AUX_PSEUDO_MONOCHROME      1      ///> JCVVC-R0063: pseudo monochrome for auxiliary pictures
 
 #define O0062_POC_LSB_NOT_PRESENT_FLAG   1      ///< JCTVC-O0062: signal poc_lsb_not_present_flag for each layer in VPS extension