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

Timestamp:

22 Sep 2015, 20:18:26 (9 years ago)

Author:

seregin

Message:

port rev 4600, remove macro Q0074_COLOUR_REMAPPING_SEI

Location:

branches/SHM-dev/source/App/TAppEncoder

Files:

• TAppEncCfg.cpp (modified) (4 diffs)
• TAppEncCfg.h (modified) (1 diff)
• TAppEncLayerCfg.h (modified) (1 diff)
• TAppEncTop.cpp (modified) (2 diffs)

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

@@ -773 +773 @@
 
   Int*    cfg_maxTidIlRefPicsPlus1[MAX_LAYERS]; 
-#if Q0074_COLOUR_REMAPPING_SEI
   string* cfg_colourRemapSEIFileRoot[MAX_LAYERS];
-#endif
   Bool*   cfg_entropyCodingSyncEnabledFlag[MAX_LAYERS];
   Int*    cfg_layerSwitchOffBegin[MAX_LAYERS];
@@ -792 +790 @@
     cfg_dQPFileName[layer]  = &m_apcLayerCfg[layer]->m_dQPFileName;
     cfg_fQP[layer]          = &m_apcLayerCfg[layer]->m_fQP;
-#if Q0074_COLOUR_REMAPPING_SEI
     cfg_colourRemapSEIFileRoot[layer] = &m_apcLayerCfg[layer]->m_colourRemapSEIFileRoot;
-#endif
     cfg_repFormatIdx[layer]         = &m_apcLayerCfg[layer]->m_repFormatIdx;
     cfg_layerId[layer]              = &m_apcLayerCfg[layer]->m_layerId;
@@ -1072 +1068 @@
   ("PhaseHorChroma%d",                              cfg_phaseHorChromaPtr,            string(""), m_numLayers, "chroma shift in the horizontal direction used in resampling proces")
   ("PhaseVerChroma%d",                              cfg_phaseVerChromaPtr,            string(""), m_numLayers, "chroma shift in the vertical   direction used in resampling proces")
-#if Q0074_COLOUR_REMAPPING_SEI
   ("SEIColourRemappingInfoFileRoot%d,-cri",         cfg_colourRemapSEIFileRoot,       string(""), m_numLayers, "Colour Remapping Information SEI parameters root file name (wo num ext)")
-#endif
   ("InputBitDepth%d",                                cfg_InputBitDepth[CHANNEL_TYPE_LUMA],     8, m_numLayers, "Bit-depth of input file for layer %d")
   ("InternalBitDepth%d",                             cfg_InternalBitDepth[CHANNEL_TYPE_LUMA],  0, m_numLayers, "Bit-depth the codec operates at. (default:InputBitDepth) for layer %d "
@@ -1460 +1454 @@
   ("Log2MaxMvLengthVertical",                         m_log2MaxMvLengthVertical,                           15, "Indicate the maximum absolute value of a decoded vertical MV component in quarter-pel luma units")
 #if !SVC_EXTENSION
-#if Q0074_COLOUR_REMAPPING_SEI
   ("SEIColourRemappingInfoFileRoot,-cri",             m_colourRemapSEIFileRoot,                    string(""), "Colour Remapping Information SEI parameters root file name (wo num ext)")
-#endif
 #endif
   ("SEIRecoveryPoint",                                m_recoveryPointSEIEnabled,                        false, "Control generation of recovery point SEI messages")

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

@@ -458 +458 @@
   Int       m_log2MaxMvLengthVertical;                        ///< Indicate the maximum absolute value of a decoded vertical MV component in quarter-pel luma units
 #if !SVC_EXTENSION
-#if Q0074_COLOUR_REMAPPING_SEI
   std::string m_colourRemapSEIFileRoot;
-#endif
 #endif
 

branches/SHM-dev/source/App/TAppEncoder/TAppEncLayerCfg.h

@@ -134 +134 @@
 
   Int       m_repFormatIdx;
-#if Q0074_COLOUR_REMAPPING_SEI
   string    m_colourRemapSEIFileRoot;
-#endif
 
   Int       m_layerSwitchOffBegin;

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

@@ -509 +509 @@
     Int&           m_maxTempLayer                               = m_apcLayerCfg[layer]->m_maxTempLayer;
 
-#if Q0074_COLOUR_REMAPPING_SEI
     string&        m_colourRemapSEIFileRoot                     = m_apcLayerCfg[layer]->m_colourRemapSEIFileRoot;
-#endif
 #endif
 
@@ -766 +764 @@
   m_cTEncTop.setKneeSEIInputKneePoint                             ( m_kneeSEIInputKneePoint );
   m_cTEncTop.setKneeSEIOutputKneePoint                            ( m_kneeSEIOutputKneePoint );
-#if Q0074_COLOUR_REMAPPING_SEI
   m_cTEncTop.setColourRemapInfoSEIFileRoot                        ( m_colourRemapSEIFileRoot );
-#endif
   m_cTEncTop.setMasteringDisplaySEI                               ( m_masteringDisplay );