From 068af6bd36ebcc24c9f64e5bdb1aa817657c720a Mon Sep 17 00:00:00 2001
From: Frank Bossen <fbossen@gmail.com>
Date: Fri, 15 Jan 2021 11:11:10 -0500
Subject: [PATCH] remove macro JVET_S0175_ASPECT5
---
source/Lib/CommonLib/TypeDef.h | 1 -
source/Lib/DecoderLib/SEIread.cpp | 8 --------
source/Lib/EncoderLib/SEIwrite.cpp | 8 --------
3 files changed, 17 deletions(-)
diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h
index 31d1ec85c7..0e915e0745 100644
--- a/source/Lib/CommonLib/TypeDef.h
+++ b/source/Lib/CommonLib/TypeDef.h
@@ -58,7 +58,6 @@
#define JVET_S0078_NOOUTPUTPRIORPICFLAG 0 // JVET-S0078: Handling of NoOutputOfPriorPicsFlag in output process
#define FIX_TICKET_1405 1 // Add dph_sei_single_component_flag and dph_sei_reserved_zero_7bits syntax to decoded picture hash SEI message
#define FIX_SUBPICS_W_RPR 1 // Fix handling of RPR with subpictures (via scaling windows with no resolution change)
-#define JVET_S0175_ASPECT5 1 // use u(8) instead of u(4) for (ffi_)display_elemental_periods_minus1 and pt_display_elemental_periods_minus1
#define JVET_S0175_ASPECT6 1 // The general_nal_hrd_params_present_flag and general_vcl_hrd_params_present_flag are allowed to both be equal to 0
#define JVET_R0046_IRAP_ASPECT2 1 // Add a constraint on an ILRP being either an IRAP picture or having TemporalId less than or equal to Max (0, vps_max_tid_il_ref_pics_plus1[ refPicVpsLayerId ] - 1 )
#define JVET_T0064 1 // JVET-T0064: control of filter strength for ALF
diff --git a/source/Lib/DecoderLib/SEIread.cpp b/source/Lib/DecoderLib/SEIread.cpp
index 4953439c8d..ae297bbd37 100644
--- a/source/Lib/DecoderLib/SEIread.cpp
+++ b/source/Lib/DecoderLib/SEIread.cpp
@@ -986,11 +986,7 @@ void SEIReader::xParseSEIPictureTiming(SEIPictureTiming& sei, uint32_t payloadSi
sei.m_duCommonCpbRemovalDelayFlag = 0;
}
}
-#if JVET_S0175_ASPECT5
sei_read_code( pDecodedMessageOutputStream, 8, symbol, "pt_display_elemental_periods_minus1" );
-#else
- sei_read_uvlc( pDecodedMessageOutputStream, symbol, "pt_display_elemental_periods_minus1" );
-#endif
sei.m_ptDisplayElementalPeriodsMinus1 = symbol;
}
@@ -1144,11 +1140,7 @@ void SEIReader::xParseSEIFrameFieldinfo(SEIFrameFieldInfo& sei, uint32_t payload
sei_read_flag( pDecodedMessageOutputStream, symbol, "ffi_top_field_first_flag" );
sei.m_topFieldFirstFlag = symbol;
}
-#if JVET_S0175_ASPECT5
sei_read_code( pDecodedMessageOutputStream, 8, symbol, "ffi_display_elemental_periods_minus1" );
-#else
- sei_read_uvlc( pDecodedMessageOutputStream, symbol, "ffi_display_elemental_periods_minus1" );
-#endif
sei.m_displayElementalPeriodsMinus1 = symbol;
}
sei_read_code( pDecodedMessageOutputStream, 2, symbol, "ffi_source_scan_type" );
diff --git a/source/Lib/EncoderLib/SEIwrite.cpp b/source/Lib/EncoderLib/SEIwrite.cpp
index 31ecfa2dbb..27b2bb65b9 100644
--- a/source/Lib/EncoderLib/SEIwrite.cpp
+++ b/source/Lib/EncoderLib/SEIwrite.cpp
@@ -458,11 +458,7 @@ void SEIWriter::xWriteSEIPictureTiming(const SEIPictureTiming& sei, const SEIBuf
}
}
}
-#if !JVET_S0175_ASPECT5
- WRITE_UVLC( sei.m_ptDisplayElementalPeriodsMinus1, "pt_display_elemental_periods_minus1" );
-#else
WRITE_CODE( sei.m_ptDisplayElementalPeriodsMinus1, 8, "pt_display_elemental_periods_minus1" );
-#endif
}
void SEIWriter::xWriteSEIFrameFieldInfo(const SEIFrameFieldInfo& sei)
@@ -484,11 +480,7 @@ void SEIWriter::xWriteSEIFrameFieldInfo(const SEIFrameFieldInfo& sei)
{
WRITE_FLAG( sei.m_topFieldFirstFlag ? 1 : 0, "ffi_top_field_first_flag" );
}
-#if !JVET_S0175_ASPECT5
- WRITE_UVLC( sei.m_displayElementalPeriodsMinus1, "ffi_display_elemental_periods_minus1" );
-#else
WRITE_CODE( sei.m_displayElementalPeriodsMinus1, 8, "ffi_display_elemental_periods_minus1" );
-#endif
}
WRITE_CODE( sei.m_sourceScanType, 2, "ffi_source_scan_type" );
WRITE_FLAG( sei.m_duplicateFlag ? 1 : 0, "ffi_duplicate_flag" );
--
GitLab