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

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

Files:

• TAppDecoder/TAppDecCfg.cpp (modified) (1 diff)
• TAppDecoder/TAppDecCfg.h (modified) (2 diffs)
• TAppDecoder/TAppDecTop.cpp (modified) (14 diffs)
• TAppDecoder/TAppDecTop.h (modified) (2 diffs)
• TAppEncoder/TAppEncCfg.cpp (modified) (4 diffs)
• TAppEncoder/TAppEncCfg.h (modified) (1 diff)
• TAppEncoder/TAppEncLayerCfg.h (modified) (1 diff)
• TAppEncoder/TAppEncTop.cpp (modified) (2 diffs)

branches/SHM-dev/source/App/TAppDecoder/TAppDecCfg.cpp

@@ -128 +128 @@
   ("TarDecLayerIdSetFile,l",    cfg_TargetDecLayerIdSetFile,           string(""), "targetDecLayerIdSet file name. The file should include white space separated LayerId values to be decoded. Omitting the option or a value of -1 in the file decodes all layers.")
   ("RespectDefDispWindow,w",    m_respectDefDispWindow,                0,          "Only output content inside the default display window\n")
-#if Q0074_COLOUR_REMAPPING_SEI
   ("SEIColourRemappingInfoFilename",  m_colourRemapSEIFileName,        string(""), "Colour Remapping YUV output file name. If empty, no remapping is applied (ignore SEI message)\n")
-#endif
 #if O0043_BEST_EFFORT_DECODING
   ("ForceDecodeBitDepth",       m_forceDecodeBitDepth,                 0U,         "Force the decoder to operate at a particular bit-depth (best effort decoding)")

branches/SHM-dev/source/App/TAppDecoder/TAppDecCfg.h

@@ -74 +74 @@
   Int           m_decodedPictureHashSEIEnabled;       ///< Checksum(3)/CRC(2)/MD5(1)/disable(0) acting on decoded picture hash SEI message
   Bool          m_decodedNoDisplaySEIEnabled;         ///< Enable(true)/disable(false) writing only pictures that get displayed based on the no display SEI message
-#if Q0074_COLOUR_REMAPPING_SEI
   std::string   m_colourRemapSEIFileName;             ///< output Colour Remapping file name
-#endif
   std::vector<Int> m_targetDecLayerIdSet;             ///< set of LayerIds to be included in the sub-bitstream extraction process.
   Int           m_respectDefDispWindow;               ///< Only output content inside the default display window
@@ -112 +110 @@
   , m_decodedPictureHashSEIEnabled(0)
   , m_decodedNoDisplaySEIEnabled(false)
-#if Q0074_COLOUR_REMAPPING_SEI
   , m_colourRemapSEIFileName()
-#endif
   , m_targetDecLayerIdSet()
   , m_respectDefDispWindow(0)

branches/SHM-dev/source/App/TAppDecoder/TAppDecTop.cpp

@@ -62 +62 @@
 #if SVC_EXTENSION
 TAppDecTop::TAppDecTop()
-#if Q0074_COLOUR_REMAPPING_SEI
 : m_pcSeiColourRemappingInfoPrevious(NULL)
-#endif
 {
   memset( m_apcTDecTop, 0, sizeof(m_apcTDecTop) );
@@ -77 +75 @@
 TAppDecTop::TAppDecTop()
 : m_iPOCLastDisplay(-MAX_INT)
-#if Q0074_COLOUR_REMAPPING_SEI
  ,m_pcSeiColourRemappingInfoPrevious(NULL)
-#endif
 {
 }
@@ -163 +159 @@
 #endif
 
-#if Q0074_COLOUR_REMAPPING_SEI
   // clear contents of colour-remap-information-SEI output file
   if (!m_colourRemapSEIFileName.empty())
@@ -174 +169 @@
     }
   }
-#endif
 
   // main decoder loop
@@ -629 +623 @@
   m_cTDecTop.destroy();
 #endif
-#if Q0074_COLOUR_REMAPPING_SEI
   if (m_pcSeiColourRemappingInfoPrevious != NULL)
   {
@@ -635 +628 @@
     m_pcSeiColourRemappingInfoPrevious = NULL;
   }
-#endif
 }
 
@@ -656 +648 @@
   m_cTDecTop.setForceDecodeBitDepth(m_forceDecodeBitDepth);
 #endif
-
   if (!m_outputDecodedSEIMessagesFilename.empty())
   {
@@ -674 +665 @@
 #endif
 
-#if Q0074_COLOUR_REMAPPING_SEI
   if (m_pcSeiColourRemappingInfoPrevious != NULL)
   {
@@ -680 +670 @@
     m_pcSeiColourRemappingInfoPrevious = NULL;
   }
-#endif
 }
 
@@ -911 +900 @@
         }
 
-#if Q0074_COLOUR_REMAPPING_SEI
         if (!m_colourRemapSEIFileName.empty())
         {
           xOutputColourRemapPic(pcPic);
         }
-#endif
 
         // update POC of display order
@@ -1083 +1070 @@
         }
 
-#if Q0074_COLOUR_REMAPPING_SEI
         if (!m_colourRemapSEIFileName.empty())
         {
           xOutputColourRemapPic(pcPic);
         }
-#endif
 
         // update POC of display order
@@ -1146 +1131 @@
   return false;
 }
-
-#if Q0074_COLOUR_REMAPPING_SEI
 
 Void TAppDecTop::xOutputColourRemapPic(TComPic* pcPic)
@@ -1468 +1451 @@
   }
 }
-#endif
 
 #if ALIGNED_BUMPING
@@ -1491 +1473 @@
       conf.getWindowBottomOffset()* yScal + defDisp.getWindowBottomOffset() );
 
-#if Q0074_COLOUR_REMAPPING_SEI
     if( !m_colourRemapSEIFileName.empty() )
     {
       xOutputColourRemapPic(pic);
     }
-#endif
   }
   // update POC of display order

branches/SHM-dev/source/App/TAppDecoder/TAppDecTop.h

@@ -81 +81 @@
   std::ofstream                   m_seiMessageFileStream;         ///< Used for outputing SEI messages.
 
-#if Q0074_COLOUR_REMAPPING_SEI
   SEIColourRemappingInfo*         m_pcSeiColourRemappingInfoPrevious;
-#endif
 
 public:
@@ -125 +123 @@
   Bool  isNaluWithinTargetDecLayerIdSet ( InputNALUnit* nalu ); ///< check whether given Nalu is within targetDecLayerIdSet
 
-#if Q0074_COLOUR_REMAPPING_SEI
 private:
   Void applyColourRemapping(const TComPicYuv& pic, SEIColourRemappingInfo& pCriSEI, const TComSPS &activeSPS);
   Void xOutputColourRemapPic(TComPic* pcPic);
-#endif
+
 #if ALIGNED_BUMPING
   Void checkOutputBeforeDecoding(Int layerIdx);

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 );