remove macro FVI_SEI_MESSAGE

source/App/TAppEncoder/TAppEncCfg.cpp

@@ -750,7 +750,6 @@ Bool TAppEncCfg::parseCfg( Int argc, TChar* argv[] )
   SMultiValueInput<UInt>   cfg_rwpSEIRwpBottomGuardBandHeight         (0, std::numeric_limits<UChar>::max(), 0, std::numeric_limits<UChar>::max());
   SMultiValueInput<Bool>   cfg_rwpSEIRwpGuardBandNotUsedForPredFlag   (0, 1,   0, std::numeric_limits<UChar>::max());
   SMultiValueInput<UInt>   cfg_rwpSEIRwpGuardBandType                 (0, 7,   0, 4*std::numeric_limits<UChar>::max());
-#if FVI_SEI_MESSAGE
   SMultiValueInput<UInt>   cfg_fviSEIFisheyeCircularRegionCentreX     (0, std::numeric_limits<UInt>::max(), 0, 4); // CONFIRM: all the '3's have been changed to '4's since "The value of fisheye_num_active_areas_minus1 shall be in the range of 0 to 3, inclusive", so up to 4 entries.
   SMultiValueInput<UInt>   cfg_fviSEIFisheyeCircularRegionCentreY     (0, std::numeric_limits<UInt>::max(), 0, 4);
   SMultiValueInput<UInt>   cfg_fviSEIFisheyeRectRegionTop             (0, std::numeric_limits<UInt>::max(), 0, 4); // do not know the height of the picture at this point, so cannot limit region top.
@@ -769,7 +768,6 @@ Bool TAppEncCfg::parseCfg( Int argc, TChar* argv[] )
   SMultiValueInput<UInt>   cfg_fviSEIFisheyeNumPolynomialCoeffs       (0, 8, 0, 4);
   SMultiValueInput<Int>    cfg_fviSEIFisheyePolynomialCoeff           (std::numeric_limits<Int>::min(), std::numeric_limits<Int>::max(), 0, 4*8);
   UInt cfg_fviSEIFisheyeNumActiveAreasMinus1=0;
-#endif
 #if SHUTTER_INTERVAL_SEI_MESSAGE
   SMultiValueInput<UInt>   cfg_siiSEIInputNumUnitsInSI                (0, MAX_UINT, 0, 7);
 #endif
@@ -1290,7 +1288,6 @@ Bool TAppEncCfg::parseCfg( Int argc, TChar* argv[] )
   ("SEIRwpBottomGuardBandHeight",                     cfg_rwpSEIRwpBottomGuardBandHeight,       cfg_rwpSEIRwpBottomGuardBandHeight,       "specifies the height of the guard band below the i-th packed region.")
   ("SEIRwpGuardBandNotUsedForPredFlag",               cfg_rwpSEIRwpGuardBandNotUsedForPredFlag, cfg_rwpSEIRwpGuardBandNotUsedForPredFlag, "Specifies if the guard bands is used in the inter prediction process.")
   ("SEIRwpGuardBandType",                             cfg_rwpSEIRwpGuardBandType,               cfg_rwpSEIRwpGuardBandType,               "Specifies the type of the guard bands for the i-th packed region.")
-#if FVI_SEI_MESSAGE
   ("SEIFviEnabled",                                   m_fisheyeVIdeoInfoSEIEnabled,             false,                                   "Controls if fisheye video information SEI message enabled")
   ("SEIFviCancelFlag",                                m_fisheyeVideoInfoSEI.m_fisheyeCancelFlag,                true,                    "Specifies the persistence of any previous fisheye video information SEI message in output order.")
   ("SEIFviPersistenceFlag",                           m_fisheyeVideoInfoSEI.m_fisheyePersistenceFlag,           false,                   "Specifies the persistence of the fisheye video information SEI message for the current layer.")
@@ -1313,7 +1310,6 @@ Bool TAppEncCfg::parseCfg( Int argc, TChar* argv[] )
   ("SEIFviFieldOfView",                               cfg_fviSEIFisheyeFieldOfView,             cfg_fviSEIFisheyeFieldOfView,            "Specifies the field of view of the lens that corresponds to the i-th active area")
   ("SEIFviNumPolynomialCoeffs",                       cfg_fviSEIFisheyeNumPolynomialCoeffs,     cfg_fviSEIFisheyeNumPolynomialCoeffs,    "Specifies the number of polynomial coefficients for the circular region")
   ("SEIFviPolynomialCoeff",                           cfg_fviSEIFisheyePolynomialCoeff,         cfg_fviSEIFisheyePolynomialCoeff,        "Specifies the j-th polynomial coefficient value of the curve function that maps the normalized distance of a luma sample from the centre of the circular region corresponding to the i-th active area to the angular value of a sphere coordinate from the normal vector of a nominal imaging plane that passes through the centre of the sphere coordinate system for the i-th active region.")
-#endif
 #if RNSEI
   ("SEIRegionalNestingFileRoot,-rns",                 m_regionalNestingSEIFileRoot,                    string(""), "Regional nesting SEI parameters root file name (wo num ext); only the file name base is to be added. Underscore and POC would be automatically addded to . E.g. \"-rns rns\" will search for files rns_0.txt, rns_1.txt, ...")
 #endif
@@ -1958,7 +1954,6 @@ Bool TAppEncCfg::parseCfg( Int argc, TChar* argv[] )
       }
     }
   }
-#if FVI_SEI_MESSAGE
   if (!m_fisheyeVideoInfoSEI.m_fisheyeCancelFlag && m_fisheyeVIdeoInfoSEIEnabled)
   {
     if (cfg_fviSEIFisheyeNumActiveAreasMinus1 < 0 || cfg_fviSEIFisheyeNumActiveAreasMinus1 > 3)             { fprintf(stderr, "Bad number of FVI active areas\n"); exit(EXIT_FAILURE); }
@@ -2019,7 +2014,6 @@ Bool TAppEncCfg::parseCfg( Int argc, TChar* argv[] )
       }
     }
   }
-#endif
 #if SHUTTER_INTERVAL_SEI_MESSAGE
   if (m_siiSEIEnabled)
   {

source/App/TAppEncoder/TAppEncCfg.h

@@ -419,10 +419,8 @@ protected:
 #if AR_SEI_MESSAGE
   std::string           m_arSEIFileRoot;
 #endif
-#if FVI_SEI_MESSAGE
   Bool                    m_fisheyeVIdeoInfoSEIEnabled;
   TComSEIFisheyeVideoInfo m_fisheyeVideoInfoSEI;
-#endif
   // weighted prediction
   Bool      m_useWeightedPred;                    ///< Use of weighted prediction in P slices
   Bool      m_useWeightedBiPred;                  ///< Use of bi-directional weighted prediction in B slices

source/App/TAppEncoder/TAppEncTop.cpp

@@ -454,7 +454,6 @@ Void TAppEncTop::xInitLibCfg()
   m_cTEncTop.setAmbientViewingEnvironmentSEIAmbientLightX         ((UShort)m_aveSEIAmbientLightX);
   m_cTEncTop.setAmbientViewingEnvironmentSEIAmbientLightY         ((UShort)m_aveSEIAmbientLightY);
 #endif
-#if FVI_SEI_MESSAGE
   if (m_fisheyeVIdeoInfoSEIEnabled)
   {
     m_cTEncTop.setFviSEIEnabled(m_fisheyeVideoInfoSEI);
@@ -463,7 +462,6 @@ Void TAppEncTop::xInitLibCfg()
   {
     m_cTEncTop.setFviSEIDisabled();
   }
-#endif
   m_cTEncTop.setColourRemapInfoSEIFileRoot                        ( m_colourRemapSEIFileRoot );
   m_cTEncTop.setMasteringDisplaySEI                               ( m_masteringDisplay );
   m_cTEncTop.setSEIAlternativeTransferCharacteristicsSEIEnable    ( m_preferredTransferCharacteristics>=0     );

source/Lib/TLibCommon/SEI.cpp

@@ -83,9 +83,7 @@ const std::vector<SEI::PayloadType> SEI::prefix_sei_messages({
   , SEI::OMNI_VIEWPORT
   , SEI::CUBEMAP_PROJECTION
   , SEI::REGION_WISE_PACKING
-#if FVI_SEI_MESSAGE
   , SEI::FISHEYE_VIDEO_INFO
-#endif
 #if RNSEI
   , SEI::REGIONAL_NESTING
 #endif
@@ -308,9 +306,7 @@ const TChar *SEI::getSEIMessageString(SEI::PayloadType payloadType)
     case SEI::OMNI_VIEWPORT:                        return "Omni viewport";
     case SEI::CUBEMAP_PROJECTION:                  return "Cubemap projection";
     case SEI::REGION_WISE_PACKING:                  return "Region wise packing information";
-#if FVI_SEI_MESSAGE
     case SEI::FISHEYE_VIDEO_INFO:                   return "Fisheye video information";
-#endif
 #if RNSEI
     case SEI::REGIONAL_NESTING:                     return "Regional nesting";
 #endif

source/Lib/TLibCommon/SEI.h

@@ -98,9 +98,7 @@ public:
     SPHERE_ROTATION                      = 154,
     OMNI_VIEWPORT                        = 156,
     CUBEMAP_PROJECTION                   = 151,
-#if FVI_SEI_MESSAGE
     FISHEYE_VIDEO_INFO                   = 152,
-#endif
     REGION_WISE_PACKING                  = 155, 
 #if RNSEI
     REGIONAL_NESTING                     = 157,
@@ -951,7 +949,6 @@ public:
   std::vector<UChar>    m_rwpGuardBandType;
 };
 
-#if FVI_SEI_MESSAGE
 class SEIFisheyeVideoInfo : public SEI
 {
 public:
@@ -960,7 +957,6 @@ public:
   virtual ~SEIFisheyeVideoInfo() {}
   TComSEIFisheyeVideoInfo values;
 };
-#endif
 
 #if SHUTTER_INTERVAL_SEI_MESSAGE
 class SEIShutterIntervalInfo : public SEI

source/Lib/TLibCommon/TypeDef.h

@@ -98,7 +98,6 @@
 
 #define MCTS_ENC_CHECK                                    1  ///< Temporal MCTS encoder constraint and decoder checks. Also requires SEITMCTSTileConstraint to be enabled to enforce constraint
 
-#define FVI_SEI_MESSAGE                                   1 // Fisheye Video Information SEI message	
 
 #define RNSEI                                             1  ///< Support for signalling regional nesting SEI message
 
@@ -915,7 +914,6 @@ struct WCGChromaQPControl
   Double chromaQpOffset;  ///< Chroma QP Offset (0.0:default)
 };
 
-#if FVI_SEI_MESSAGE
 struct TComSEIFisheyeVideoInfo
 {
   struct ActiveAreaInfo
@@ -945,7 +943,6 @@ struct TComSEIFisheyeVideoInfo
   std::vector<ActiveAreaInfo> m_fisheyeActiveAreas;
   TComSEIFisheyeVideoInfo() : m_fisheyeCancelFlag(false), m_fisheyePersistenceFlag(false), m_fisheyeViewDimensionIdc(0), m_fisheyeActiveAreas() { }
 };
-#endif
 
 class Window
 {

source/Lib/TLibDecoder/SEIread.cpp

@@ -377,12 +377,10 @@ Void SEIReader::xReadSEIPayloadData(Int const payloadType, Int const payloadSize
       xParseSEIAnnotatedRegions((SEIAnnotatedRegions&)*sei, payloadSize, pDecodedMessageOutputStream);
       break;
 #endif
-#if FVI_SEI_MESSAGE
     case SEI::FISHEYE_VIDEO_INFO:
       sei = new SEIFisheyeVideoInfo;
       xParseSEIFisheyeVideoInfo((SEIFisheyeVideoInfo&)*sei, payloadSize, pDecodedMessageOutputStream);
       break;
-#endif
 #if RNSEI
     case SEI::REGIONAL_NESTING:
       sei = new SEIRegionalNesting;
@@ -1861,7 +1859,6 @@ Void SEIReader::xParseSEIRegionWisePacking(SEIRegionWisePacking& sei, UInt paylo
   }
 }
 
-#if FVI_SEI_MESSAGE
 Void SEIReader::xParseSEIFisheyeVideoInfo(SEIFisheyeVideoInfo& sei, UInt payloadSize, std::ostream *pDecodedMessageOutputStream)
 {
   UInt val;
@@ -1912,7 +1909,6 @@ Void SEIReader::xParseSEIFisheyeVideoInfo(SEIFisheyeVideoInfo& sei, UInt payload
     }
   }
 }
-#endif
 
 Void SEIReader::xParseSEIColourRemappingInfo(SEIColourRemappingInfo& sei, UInt payloadSize, std::ostream *pDecodedMessageOutputStream)
 {

source/Lib/TLibDecoder/SEIread.h

@@ -103,9 +103,7 @@ protected:
   Void xParseSEIAnnotatedRegions              (SEIAnnotatedRegions& sei,              UInt payloadSize,                     std::ostream *pDecodedMessageOutputStream);
 #endif
   Void xParseSEIRegionWisePacking             (SEIRegionWisePacking& sei,             UInt payloadSize,                     std::ostream *pDecodedMessageOutputStream);
-#if FVI_SEI_MESSAGE
   Void xParseSEIFisheyeVideoInfo(SEIFisheyeVideoInfo& sei, UInt payloadSize, std::ostream *pDecodedMessageOutputStream);
-#endif
   Void xParseSEIColourRemappingInfo           (SEIColourRemappingInfo& sei,           UInt payloadSize,                     std::ostream *pDecodedMessageOutputStream);
   Void xParseSEIDeinterlaceFieldIdentification(SEIDeinterlaceFieldIdentification& sei,UInt payLoadSize,                     std::ostream *pDecodedMessageOutputStream);
   Void xParseSEIContentLightLevelInfo         (SEIContentLightLevelInfo& sei,         UInt payLoadSize,                     std::ostream *pDecodedMessageOutputStream);

source/Lib/TLibEncoder/SEIEncoder.cpp

@@ -735,14 +735,12 @@ Void SEIEncoder::initSEIRegionWisePacking(SEIRegionWisePacking *seiRegionWisePac
   }
 }
 
-#if FVI_SEI_MESSAGE
 Void SEIEncoder::initSEIFisheyeVideoInfo(SEIFisheyeVideoInfo *seiFisheyeVideoInfo)
 {
   assert(m_isInitialized);
   assert(seiFisheyeVideoInfo != NULL);
   seiFisheyeVideoInfo->values = m_pcCfg->getFviSEIData();
 }
-#endif
 
 #if AR_SEI_MESSAGE
 template <typename T>

source/Lib/TLibEncoder/SEIEncoder.h

@@ -95,9 +95,7 @@ public:
   Void initSEIOmniViewport(SEIOmniViewport *sei);
   Void initSEICubemapProjection(SEICubemapProjection *sei);
   Void initSEIRegionWisePacking(SEIRegionWisePacking *sei);
-#if FVI_SEI_MESSAGE
   Void initSEIFisheyeVideoInfo(SEIFisheyeVideoInfo *sei);
-#endif
   Void initSEIChromaResamplingFilterHint(SEIChromaResamplingFilterHint *sei, Int iHorFilterIndex, Int iVerFilterIndex);
   Void initSEITimeCode(SEITimeCode *sei);
   Bool initSEIColourRemappingInfo(SEIColourRemappingInfo *sei, Int currPOC); // returns true on success, false on failure.

source/Lib/TLibEncoder/SEIwrite.cpp

@@ -194,11 +194,9 @@ Void SEIWriter::xWriteSEIpayloadData(TComBitIf& bs, const SEI& sei, const TComSP
   case SEI::REGION_WISE_PACKING:
     xWriteSEIRegionWisePacking(*static_cast<const SEIRegionWisePacking*>(&sei));
     break;
-#if FVI_SEI_MESSAGE
   case SEI::FISHEYE_VIDEO_INFO:
     xWriteSEIFisheyeVideoInfo(*static_cast<const SEIFisheyeVideoInfo*>(&sei));
     break;
-#endif
 #if RNSEI
   case SEI::REGIONAL_NESTING:
     xWriteSEIRegionalNesting(bs, *static_cast<const SEIRegionalNesting*>(&sei), sps);
@@ -1256,7 +1254,6 @@ Void SEIWriter::xWriteSEIRegionWisePacking(const SEIRegionWisePacking &sei)
   }
 }
 
-#if FVI_SEI_MESSAGE
 Void SEIWriter::xWriteSEIFisheyeVideoInfo(const SEIFisheyeVideoInfo &sei)
 {
   const TComSEIFisheyeVideoInfo &info=sei.values;
@@ -1299,7 +1296,6 @@ Void SEIWriter::xWriteSEIFisheyeVideoInfo(const SEIFisheyeVideoInfo &sei)
     }
   }
 }
-#endif
 
 Void SEIWriter::xWriteSEIColourRemappingInfo(const SEIColourRemappingInfo& sei)
 {

source/Lib/TLibEncoder/SEIwrite.h

@@ -94,9 +94,7 @@ protected:
   Void xWriteSEIOmniViewport                      (const SEIOmniViewport& sei);
   Void xWriteSEICubemapProjection                 (const SEICubemapProjection &sei);
   Void xWriteSEIRegionWisePacking                 (const SEIRegionWisePacking &sei);
-#if FVI_SEI_MESSAGE
   Void xWriteSEIFisheyeVideoInfo                  (const SEIFisheyeVideoInfo &sei);
-#endif
   Void xWriteSEIColourRemappingInfo               (const SEIColourRemappingInfo& sei);
   Void xWriteSEIDeinterlaceFieldIdentification    (const SEIDeinterlaceFieldIdentification& sei);
   Void xWriteSEIContentLightLevelInfo             (const SEIContentLightLevelInfo& sei);

source/Lib/TLibEncoder/TEncCfg.h

@@ -440,10 +440,8 @@ protected:
 #if AR_SEI_MESSAGE
   std::string           m_arSEIFileRoot;  // Annotated region SEI - initialized from external file
 #endif
-#if FVI_SEI_MESSAGE
   Bool                    m_fviSEIEnabled;
   TComSEIFisheyeVideoInfo m_fisheyeVideoInfo;
-#endif
 #if RNSEI
   std::string m_regionalNestingSEIFileRoot;  // Regional nesting SEI - initialized from external file
 #endif
@@ -1165,12 +1163,10 @@ public:
   Bool    getRwpSEIRwpGuardBandNotUsedForPredFlag(UInt idx) const                                         { return m_rwpSEIRwpGuardBandNotUsedForPredFlag[idx]; }
   Void    setRwpSEIRwpGuardBandType(const std::vector<UChar>& rwpGuardBandType)                           { m_rwpSEIRwpGuardBandType = rwpGuardBandType; }
   UChar   getRwpSEIRwpGuardBandType(UInt idx) const                                                       { return m_rwpSEIRwpGuardBandType[idx]; } 
-#if FVI_SEI_MESSAGE
   Void    setFviSEIDisabled()                                        { m_fviSEIEnabled = false; }
   Void    setFviSEIEnabled(const TComSEIFisheyeVideoInfo& fvi)       { m_fisheyeVideoInfo=fvi; m_fviSEIEnabled=true; }
   Bool    getFviSEIEnabled() const                                   { return m_fviSEIEnabled; }
   const TComSEIFisheyeVideoInfo& getFviSEIData() const               { return m_fisheyeVideoInfo; }
-#endif
   Void  setColourRemapInfoSEIFileRoot( const std::string &s )        { m_colourRemapSEIFileRoot = s; }
   const std::string &getColourRemapInfoSEIFileRoot() const           { return m_colourRemapSEIFileRoot; }
   Void  setMasteringDisplaySEI(const TComSEIMasteringDisplay &src)   { m_masteringDisplay = src; }

source/Lib/TLibEncoder/TEncGOP.cpp

@@ -555,14 +555,12 @@ Void TEncGOP::xCreateIRAPLeadingSEIMessages (SEIMessages& seiMessages, const TCo
     m_seiEncoder.initSEIRegionWisePacking(seiRegionWisePacking);
     seiMessages.push_back(seiRegionWisePacking);
   }
-#if FVI_SEI_MESSAGE
   if (m_pcCfg->getFviSEIEnabled())
   {
     SEIFisheyeVideoInfo *sei = new SEIFisheyeVideoInfo;
     m_seiEncoder.initSEIFisheyeVideoInfo(sei);
     seiMessages.push_back(sei);
   }
-#endif
     
   if(m_pcCfg->getMasteringDisplaySEI().colourVolumeSEIEnabled)
   {