diff --git a/source/App/EncoderApp/EncAppCfg.cpp b/source/App/EncoderApp/EncAppCfg.cpp
index 47b4defdb6a97706a5918749cbe9cc96589714ad..dfe818cbf06e3649e7588a3ffb6174398b321de7 100644
--- a/source/App/EncoderApp/EncAppCfg.cpp
+++ b/source/App/EncoderApp/EncAppCfg.cpp
@@ -4165,9 +4165,8 @@ bool EncAppCfg::xCheckParameter()
#endif
xConfirmPara(!m_TransquantBypassEnabledFlag && m_CUTransquantBypassFlagForce, "CUTransquantBypassFlagForce cannot be 1 when TransquantBypassEnableFlag is 0");
-#if HEVC_SEI || JVET_P0337_PORTING_SEI
#endif
-#if HEVC_SEI
+#if HEVC_SEI || JVET_P0337_PORTING_SEI
if (m_framePackingSEIEnabled)
{
xConfirmPara(m_framePackingSEIType < 3 || m_framePackingSEIType > 5 , "SEIFramePackingType must be in rage 3 to 5");
diff --git a/source/Lib/CommonLib/SEI.h b/source/Lib/CommonLib/SEI.h
index c9baec65f2a716795078ea844a2e69f7e69e60bd..0fc0ee73351007ca5e091f4105c1eae73fc882b5 100644
--- a/source/Lib/CommonLib/SEI.h
+++ b/source/Lib/CommonLib/SEI.h
@@ -240,7 +240,6 @@ public:
int m_sariSarHeight;
};
#endif
-#endif
#if HEVC_SEI || JVET_P0337_PORTING_SEI
static const uint32_t ISO_IEC_11578_LEN=16;
diff --git a/source/Lib/DecoderLib/SEIread.cpp b/source/Lib/DecoderLib/SEIread.cpp
index 7fcb15e13e346dbbd29779b929fa552ee0994dcc..3ce71f1820b47d3938f73aa01b51aebcf9fb919e 100644
--- a/source/Lib/DecoderLib/SEIread.cpp
+++ b/source/Lib/DecoderLib/SEIread.cpp
@@ -356,7 +356,6 @@ void SEIReader::xReadSEImessage(SEIMessages& seis, const NalUnitType nalUnitType
xParseSEISampleAspectRatioInfo((SEISampleAspectRatioInfo&) *sei, payloadSize, pDecodedMessageOutputStream);
break;
#endif
-#endif
#if JVET_P0337_PORTING_SEI
case SEI::USER_DATA_REGISTERED_ITU_T_T35:
sei = new SEIUserDataRegistered;
diff --git a/source/Lib/EncoderLib/EncGOP.cpp b/source/Lib/EncoderLib/EncGOP.cpp
index a0b6452691168f563c4b511c3f44c4d285dfcc06..ef721c421577eb532a4a08ba8aecf6e5419ccc03 100644
--- a/source/Lib/EncoderLib/EncGOP.cpp
+++ b/source/Lib/EncoderLib/EncGOP.cpp
@@ -771,7 +771,6 @@ void EncGOP::xCreateIRAPLeadingSEIMessages (SEIMessages& seiMessages, const SPS
seiMessages.push_back(seiSampleAspectRatioInfo);
}
#endif
-#endif
#if JVET_P0337_PORTING_SEI
// film grain
if (m_pcCfg->getFilmGrainCharactersticsSEIEnabled())
diff --git a/source/Lib/EncoderLib/SEIEncoder.h b/source/Lib/EncoderLib/SEIEncoder.h
index 1ec8effdf233191676019fa3784e45dc2abd6b2f..db0eb20a502f329bfb8e9b03c256fdb303bbc370 100644
--- a/source/Lib/EncoderLib/SEIEncoder.h
+++ b/source/Lib/EncoderLib/SEIEncoder.h
@@ -112,7 +112,6 @@ public:
#if JVET_P0450_SEI_SARI
void initSEISampleAspectRatioInfo(SEISampleAspectRatioInfo *sei);
#endif
-
#if JVET_P0337_PORTING_SEI
void initSEIFilmGrainCharacteristics(SEIFilmGrainCharacteristics *sei);
void initSEIMasteringDisplayColourVolume(SEIMasteringDisplayColourVolume *sei);
diff --git a/source/Lib/EncoderLib/SEIwrite.cpp b/source/Lib/EncoderLib/SEIwrite.cpp
index 70b09a1222bb8b01a341a01261d255b5862dce75..0b54d74f90d20911bd28ae1a77fecedc31fc352d 100644
--- a/source/Lib/EncoderLib/SEIwrite.cpp
+++ b/source/Lib/EncoderLib/SEIwrite.cpp
@@ -1102,20 +1102,6 @@ void SEIWriter::xWriteSEIGreenMetadataInfo(const SEIGreenMetadataInfo& sei)
}
#endif
#endif
-#if JVET_P0337_PORTING_SEI
-void SEIWriter::xWriteSEIUserDataRegistered(const SEIUserDataRegistered &sei)
-{
- WRITE_CODE((sei.m_ituCountryCode>255) ? 0xff : sei.m_ituCountryCode, 8, "itu_t_t35_country_code");
- if (sei.m_ituCountryCode >= 255)
- {
- assert(sei.m_ituCountryCode < 255 + 256);
- WRITE_CODE(sei.m_ituCountryCode - 255, 8, "itu_t_t35_country_code_extension_byte");
- }
- for (uint32_t i = 0; i<sei.m_userData.size(); i++)
- {
- WRITE_CODE(sei.m_userData[i], 8, "itu_t_t35_payload_byte");
- }
-}
#if JVET_P0462_SEI360
void SEIWriter::xWriteSEIEquirectangularProjection(const SEIEquirectangularProjection &sei)
@@ -1229,6 +1215,20 @@ void SEIWriter::xWriteSEISampleAspectRatioInfo(const SEISampleAspectRatioInfo &s
}
#endif
+#if JVET_P0337_PORTING_SEI
+void SEIWriter::xWriteSEIUserDataRegistered(const SEIUserDataRegistered &sei)
+{
+ WRITE_CODE((sei.m_ituCountryCode>255) ? 0xff : sei.m_ituCountryCode, 8, "itu_t_t35_country_code");
+ if (sei.m_ituCountryCode >= 255)
+ {
+ assert(sei.m_ituCountryCode < 255 + 256);
+ WRITE_CODE(sei.m_ituCountryCode - 255, 8, "itu_t_t35_country_code_extension_byte");
+ }
+ for (uint32_t i = 0; i<sei.m_userData.size(); i++)
+ {
+ WRITE_CODE(sei.m_userData[i], 8, "itu_t_t35_payload_byte");
+ }
+}
void SEIWriter::xWriteSEIFilmGrainCharacteristics(const SEIFilmGrainCharacteristics &sei)
{
@@ -1331,100 +1331,5 @@ void SEIWriter::xWriteSEIContentColourVolume(const SEIContentColourVolume &sei)
}
}
#endif
-#if JVET_P0462_SEI360
-void SEIWriter::xWriteSEIEquirectangularProjection(const SEIEquirectangularProjection &sei)
-{
- WRITE_FLAG( sei.m_erpCancelFlag, "erp_cancel_flag" );
- if( !sei.m_erpCancelFlag )
- {
- WRITE_FLAG( sei.m_erpPersistenceFlag, "erp_persistence_flag" );
- WRITE_FLAG( sei.m_erpGuardBandFlag, "erp_guard_band_flag" );
- WRITE_CODE( 0, 2, "erp_reserved_zero_2bits" );
- if ( sei.m_erpGuardBandFlag == 1)
- {
- WRITE_CODE( sei.m_erpGuardBandType, 3, "erp_guard_band_type" );
- WRITE_CODE( sei.m_erpLeftGuardBandWidth, 8, "erp_left_guard_band_width" );
- WRITE_CODE( sei.m_erpRightGuardBandWidth, 8, "erp_right_guard_band_width" );
- }
- }
-}
-
-void SEIWriter::xWriteSEISphereRotation(const SEISphereRotation &sei)
-{
- WRITE_FLAG( sei.m_sphereRotationCancelFlag, "sphere_rotation_cancel_flag" );
- if( !sei.m_sphereRotationCancelFlag )
- {
- WRITE_FLAG( sei.m_sphereRotationPersistenceFlag, "sphere_rotation_persistence_flag" );
- WRITE_CODE( 0, 6, "sphere_rotation_reserved_zero_6bits" );
- WRITE_SCODE(sei.m_sphereRotationYaw, 32, "sphere_rotation_yaw" );
- WRITE_SCODE(sei.m_sphereRotationPitch, 32, "sphere_rotation_pitch" );
- WRITE_SCODE(sei.m_sphereRotationRoll, 32, "sphere_rotation_roll" );
- }
-}
-
-void SEIWriter::xWriteSEIOmniViewport(const SEIOmniViewport &sei)
-{
- WRITE_CODE( sei.m_omniViewportId, 10, "omni_viewport_id" );
- WRITE_FLAG( sei.m_omniViewportCancelFlag, "omni_viewport_cancel_flag" );
- if ( !sei.m_omniViewportCancelFlag )
- {
- WRITE_FLAG( sei.m_omniViewportPersistenceFlag, "omni_viewport_persistence_flag" );
- const uint32_t numRegions = (uint32_t) sei.m_omniViewportRegions.size();
- WRITE_CODE( numRegions - 1, 4, "omni_viewport_cnt_minus1" );
- for(uint32_t region=0; region<numRegions; region++)
- {
- const SEIOmniViewport::OmniViewport &viewport=sei.m_omniViewportRegions[region];
- WRITE_SCODE( viewport.azimuthCentre, 32, "omni_viewport_azimuth_centre" );
- WRITE_SCODE( viewport.elevationCentre, 32, "omni_viewport_elevation_centre" );
- WRITE_SCODE( viewport.tiltCentre, 32, "omni_viewport_tilt_center" );
- WRITE_CODE( viewport.horRange, 32, "omni_viewport_hor_range[i]" );
- WRITE_CODE( viewport.verRange, 32, "omni_viewport_ver_range[i]" );
- }
- }
-}
-
-void SEIWriter::xWriteSEIRegionWisePacking(const SEIRegionWisePacking &sei)
-{
- WRITE_FLAG( sei.m_rwpCancelFlag, "rwp_cancel_flag" );
- if(!sei.m_rwpCancelFlag)
- {
- WRITE_FLAG( sei.m_rwpPersistenceFlag, "rwp_persistence_flag" );
- WRITE_FLAG( sei.m_constituentPictureMatchingFlag, "constituent_picture_matching_flag" );
- WRITE_CODE( 0, 5, "rwp_reserved_zero_5bits" );
- WRITE_CODE( (uint32_t)sei.m_numPackedRegions, 8, "num_packed_regions" );
- WRITE_CODE( (uint32_t)sei.m_projPictureWidth, 32, "proj_picture_width" );
- WRITE_CODE( (uint32_t)sei.m_projPictureHeight, 32, "proj_picture_height" );
- WRITE_CODE( (uint32_t)sei.m_packedPictureWidth, 16, "packed_picture_width" );
- WRITE_CODE( (uint32_t)sei.m_packedPictureHeight, 16, "packed_picture_height" );
- for( int i=0; i < sei.m_numPackedRegions; i++ )
- {
- WRITE_CODE( 0, 4, "rwp_reserved_zero_4bits" );
- WRITE_CODE( (uint32_t)sei.m_rwpTransformType[i], 3, "rwp_tTransform_type" );
- WRITE_FLAG( sei.m_rwpGuardBandFlag[i], "rwp_guard_band_flag" );
- WRITE_CODE( (uint32_t)sei.m_projRegionWidth[i], 32, "proj_region_width" );
- WRITE_CODE( (uint32_t)sei.m_projRegionHeight[i], 32, "proj_region_height" );
- WRITE_CODE( (uint32_t)sei.m_rwpProjRegionTop[i], 32, "rwp_proj_regionTop" );
- WRITE_CODE( (uint32_t)sei.m_projRegionLeft[i], 32, "proj_region_left" );
- WRITE_CODE( (uint32_t)sei.m_packedRegionWidth[i], 16, "packed_region_width" );
- WRITE_CODE( (uint32_t)sei.m_packedRegionHeight[i], 16, "packed_region_height" );
- WRITE_CODE( (uint32_t)sei.m_packedRegionTop[i], 16, "packed_region_top" );
- WRITE_CODE( (uint32_t)sei.m_packedRegionLeft[i], 16, "packed_region_left" );
- if( sei.m_rwpGuardBandFlag[i] )
- {
- WRITE_CODE( (uint32_t)sei.m_rwpLeftGuardBandWidth[i], 8, "rwp_left_guard_band_width");
- WRITE_CODE( (uint32_t)sei.m_rwpRightGuardBandWidth[i], 8, "rwp_right_guard_band_width");
- WRITE_CODE( (uint32_t)sei.m_rwpTopGuardBandHeight[i], 8, "rwp_top_guard_band_height");
- WRITE_CODE( (uint32_t)sei. m_rwpBottomGuardBandHeight[i], 8, "rwp_bottom_guard_band_height");
- WRITE_FLAG( sei.m_rwpGuardBandNotUsedForPredFlag[i], "rwp_guard_band_not_used_forPred_flag" );
- for( int j=0; j < 4; j++ )
- {
- WRITE_CODE( (uint32_t)sei.m_rwpGuardBandType[i*4 + j], 3, "rwp_guard_band_type");
- }
- WRITE_CODE( 0, 3, "rwp_guard_band_reserved_zero_3bits" );
- }
- }
- }
-}
-#endif
//! \}