From 757aeebd71afc2a40d8fcf4aad1d742d92f2e6a2 Mon Sep 17 00:00:00 2001
From: Andrew Segall <asegall@sharplabs.com>
Date: Thu, 11 Apr 2019 00:40:29 -0700
Subject: [PATCH] JVET-N1011: Updated HDR configuration files to match CTC
---
cfg/per-class/classH1.cfg | 13 +++++++++++++
cfg/per-class/classH2.cfg | 9 +++++++++
cfg/per-sequence-HDR/H1_BalloonFestival.cfg | 12 ------------
cfg/per-sequence-HDR/H1_Cosmos1_TreeTrunk.cfg | 7 -------
cfg/per-sequence-HDR/H1_EBU_Hurdles.cfg | 11 -----------
cfg/per-sequence-HDR/H1_EBU_Starting.cfg | 11 -----------
cfg/per-sequence-HDR/H1_Market.cfg | 11 -----------
cfg/per-sequence-HDR/H1_ShowGirl.cfg | 7 -------
cfg/per-sequence-HDR/H1_SunRise.cfg | 11 -----------
cfg/per-sequence-HDR/H2_DayStreet.cfg | 7 -------
cfg/per-sequence-HDR/H2_DayStreet_C2.cfg | 18 ------------------
...FlyingBirds2_C2.cfg => H2_FlyingBirds2.cfg} | 7 -------
.../H2_PeopleInShoppingCenter.cfg | 7 -------
.../H2_PeopleInShoppingCenter_C2.cfg | 18 ------------------
cfg/per-sequence-HDR/H2_SunsetBeach2.cfg | 6 ------
cfg/per-sequence-HDR/H2_SunsetBeach2_C2.cfg | 18 ------------------
16 files changed, 22 insertions(+), 151 deletions(-)
create mode 100644 cfg/per-class/classH1.cfg
create mode 100644 cfg/per-class/classH2.cfg
delete mode 100644 cfg/per-sequence-HDR/H2_DayStreet_C2.cfg
rename cfg/per-sequence-HDR/{H2_FlyingBirds2_C2.cfg => H2_FlyingBirds2.cfg} (73%)
delete mode 100644 cfg/per-sequence-HDR/H2_PeopleInShoppingCenter_C2.cfg
delete mode 100644 cfg/per-sequence-HDR/H2_SunsetBeach2_C2.cfg
diff --git a/cfg/per-class/classH1.cfg b/cfg/per-class/classH1.cfg
new file mode 100644
index 000000000..8db1a0003
--- /dev/null
+++ b/cfg/per-class/classH1.cfg
@@ -0,0 +1,13 @@
+# ======== Luma adaptive QP ==========
+LumaLevelToDeltaQPMode : 1 # Change luma delta QP based on average luma
+isSDR : 0 # 1: SDR in PQ container, 0: HDR
+
+# ======= LMCS =======================
+LumaReshapeEnable : 0 # turned off in HDR CTC
+
+#======== Chroma QP scale ============
+WCGPPSEnable : 1 # enable WCG Chroma scale
+WCGPPSChromaQpScale : -0.46 # Linear chroma QP offset mapping (scale) based on QP
+WCGPPSChromaQpOffset : 9.26 # Linear chroma QP offset mapping (offset) based on QP
+WCGPPSCbQpScale : 1.14 # Scale factor depending on capture and representation color space
+WCGPPSCrQpScale : 1.79 # Scale factor depending on capture and representation color space
diff --git a/cfg/per-class/classH2.cfg b/cfg/per-class/classH2.cfg
new file mode 100644
index 000000000..babeabd73
--- /dev/null
+++ b/cfg/per-class/classH2.cfg
@@ -0,0 +1,9 @@
+# ======== Luma adaptive QP ========
+LumaLevelToDeltaQPMode : 0 # Change luma delta QP based on average luma
+
+# ======= LMCS =======================
+LumaReshapeEnable : 0 # turned off in HDR CTC
+ReshapeSignalType : 2 # set signal type to HLG if enabled
+
+#======== Chroma QP scale ============
+WCGPPSEnable : 0 # enable WCG Chroma scale
diff --git a/cfg/per-sequence-HDR/H1_BalloonFestival.cfg b/cfg/per-sequence-HDR/H1_BalloonFestival.cfg
index 150521a88..ad5aa2663 100644
--- a/cfg/per-sequence-HDR/H1_BalloonFestival.cfg
+++ b/cfg/per-sequence-HDR/H1_BalloonFestival.cfg
@@ -9,15 +9,3 @@ SourceHeight : 1080 # Input frame height
FramesToBeEncoded : 240 # Number of frames to be coded
Level : 4.1
-
-#======== Chroma QP scale =============
-WCGPPSEnable : 1 # enable WCG Chroma scale
-WCGPPSEnable : 1 # enable WCG Chroma scale
-WCGPPSChromaQpScale : -0.46 # Linear chroma QP offset mapping (scale) based on QP
-WCGPPSChromaQpOffset : 9.26 # Linear chroma QP offset mapping (offset) based on QP
-WCGPPSCbQpScale : 1.14 # Scale factor depending on capture and representation color space
-WCGPPSCrQpScale : 1.79 # Scale factor depending on capture and representation color space
-
-# ======== Luma adaptive QP ========
-LumaLevelToDeltaQPMode : 1 # Change luma delta QP based on average luma
-isSDR : 0 # 1: SDR in PQ container, 0: HDR
diff --git a/cfg/per-sequence-HDR/H1_Cosmos1_TreeTrunk.cfg b/cfg/per-sequence-HDR/H1_Cosmos1_TreeTrunk.cfg
index 540461fa8..47162c8d7 100644
--- a/cfg/per-sequence-HDR/H1_Cosmos1_TreeTrunk.cfg
+++ b/cfg/per-sequence-HDR/H1_Cosmos1_TreeTrunk.cfg
@@ -11,12 +11,5 @@ FramesToBeEncoded : 240 # Number of frames to be coded
Level : 4.1
#======== Chroma QP scale =============
-WCGPPSEnable : 1 # enable WCG Chroma scale
-WCGPPSChromaQpScale : -0.46 # Linear chroma QP offset mapping (scale) based on QP
-WCGPPSChromaQpOffset : 9.26 # Linear chroma QP offset mapping (offset) based on QP
WCGPPSCbQpScale : 1.04 # Scale factor depending on capture and representation color space
WCGPPSCrQpScale : 1.39 # Scale factor depending on capture and representation color space
-
-# ======== Luma adaptive QP ========
-LumaLevelToDeltaQPMode : 1 # Change luma delta QP based on average luma
-isSDR : 0 # 1: SDR in PQ container, 0: HDR
diff --git a/cfg/per-sequence-HDR/H1_EBU_Hurdles.cfg b/cfg/per-sequence-HDR/H1_EBU_Hurdles.cfg
index 4d1f44ef8..0f0b8e4f1 100644
--- a/cfg/per-sequence-HDR/H1_EBU_Hurdles.cfg
+++ b/cfg/per-sequence-HDR/H1_EBU_Hurdles.cfg
@@ -9,14 +9,3 @@ SourceHeight : 1080 # Input frame height
FramesToBeEncoded : 500 # Number of frames to be coded
Level : 4.1
-
-#======== Chroma QP scale =============
-WCGPPSEnable : 1 # enable WCG Chroma scale
-WCGPPSChromaQpScale : -0.46 # Linear chroma QP offset mapping (scale) based on QP
-WCGPPSChromaQpOffset : 9.26 # Linear chroma QP offset mapping (offset) based on QP
-WCGPPSCbQpScale : 1.14 # Scale factor depending on capture and representation color space
-WCGPPSCrQpScale : 1.79 # Scale factor depending on capture and representation color space
-
-# ======== Luma adaptive QP ========
-LumaLevelToDeltaQPMode : 1 # Change luma delta QP based on average luma
-isSDR : 0 # 1: SDR in PQ container, 0: HDR
diff --git a/cfg/per-sequence-HDR/H1_EBU_Starting.cfg b/cfg/per-sequence-HDR/H1_EBU_Starting.cfg
index 34505213b..701df4b7e 100644
--- a/cfg/per-sequence-HDR/H1_EBU_Starting.cfg
+++ b/cfg/per-sequence-HDR/H1_EBU_Starting.cfg
@@ -9,14 +9,3 @@ SourceHeight : 1080 # Input frame height
FramesToBeEncoded : 500 # Number of frames to be coded
Level : 4.1
-
-#======== Chroma QP scale =============
-WCGPPSEnable : 1 # enable WCG Chroma scale
-WCGPPSChromaQpScale : -0.46 # Linear chroma QP offset mapping (scale) based on QP
-WCGPPSChromaQpOffset : 9.26 # Linear chroma QP offset mapping (offset) based on QP
-WCGPPSCbQpScale : 1.14 # Scale factor depending on capture and representation color space
-WCGPPSCrQpScale : 1.79 # Scale factor depending on capture and representation color space
-
-# ======== Luma adaptive QP ========
-LumaLevelToDeltaQPMode : 1 # Change luma delta QP based on average luma
-isSDR : 0 # 1: SDR in PQ container, 0: HDR
diff --git a/cfg/per-sequence-HDR/H1_Market.cfg b/cfg/per-sequence-HDR/H1_Market.cfg
index 56b955537..c4675e6fd 100644
--- a/cfg/per-sequence-HDR/H1_Market.cfg
+++ b/cfg/per-sequence-HDR/H1_Market.cfg
@@ -9,14 +9,3 @@ SourceHeight : 1080 # Input frame height
FramesToBeEncoded : 400 # Number of frames to be coded
Level : 4.1
-
-#======== Chroma QP scale =============
-WCGPPSEnable : 1 # enable WCG Chroma scale
-WCGPPSChromaQpScale : -0.46 # Linear chroma QP offset mapping (scale) based on QP
-WCGPPSChromaQpOffset : 9.26 # Linear chroma QP offset mapping (offset) based on QP
-WCGPPSCbQpScale : 1.14 # Scale factor depending on capture and representation color space
-WCGPPSCrQpScale : 1.79 # Scale factor depending on capture and representation color space
-
-# ======== Luma adaptive QP ========
-LumaLevelToDeltaQPMode : 1 # Change luma delta QP based on average luma
-isSDR : 0 # 1: SDR in PQ container, 0: HDR
diff --git a/cfg/per-sequence-HDR/H1_ShowGirl.cfg b/cfg/per-sequence-HDR/H1_ShowGirl.cfg
index 2a6ff3d3d..1f7c5222a 100644
--- a/cfg/per-sequence-HDR/H1_ShowGirl.cfg
+++ b/cfg/per-sequence-HDR/H1_ShowGirl.cfg
@@ -11,12 +11,5 @@ FramesToBeEncoded : 339 # Number of frames to be coded
Level : 4.1
#======== Chroma QP scale =============
-WCGPPSEnable : 1 # enable WCG Chroma scale
-WCGPPSChromaQpScale : -0.46 # Linear chroma QP offset mapping (scale) based on QP
-WCGPPSChromaQpOffset : 9.26 # Linear chroma QP offset mapping (offset) based on QP
WCGPPSCbQpScale : 1.04 # Scale factor depending on capture and representation color space
WCGPPSCrQpScale : 1.39 # Scale factor depending on capture and representation color space
-
-# ======== Luma adaptive QP ========
-LumaLevelToDeltaQPMode : 1 # Change luma delta QP based on average luma
-isSDR : 0 # 1: SDR in PQ container, 0: HDR
diff --git a/cfg/per-sequence-HDR/H1_SunRise.cfg b/cfg/per-sequence-HDR/H1_SunRise.cfg
index 31c70dfb7..7f6bb5b28 100644
--- a/cfg/per-sequence-HDR/H1_SunRise.cfg
+++ b/cfg/per-sequence-HDR/H1_SunRise.cfg
@@ -9,14 +9,3 @@ SourceHeight : 1080 # Input frame height
FramesToBeEncoded : 200 # Number of frames to be coded
Level : 4.1
-
-#======== Chroma QP scale =============
-WCGPPSEnable : 1 # enable WCG Chroma scale
-WCGPPSChromaQpScale : -0.46 # Linear chroma QP offset mapping (scale) based on QP
-WCGPPSChromaQpOffset : 9.26 # Linear chroma QP offset mapping (offset) based on QP
-WCGPPSCbQpScale : 1.14 # Scale factor depending on capture and representation color space
-WCGPPSCrQpScale : 1.79 # Scale factor depending on capture and representation color space
-
-# ======== Luma adaptive QP ========
-LumaLevelToDeltaQPMode : 1 # Change luma delta QP based on average luma
-isSDR : 0 # 1: SDR in PQ container, 0: HDR
diff --git a/cfg/per-sequence-HDR/H2_DayStreet.cfg b/cfg/per-sequence-HDR/H2_DayStreet.cfg
index 58a92baa6..99e77a0fe 100644
--- a/cfg/per-sequence-HDR/H2_DayStreet.cfg
+++ b/cfg/per-sequence-HDR/H2_DayStreet.cfg
@@ -9,10 +9,3 @@ SourceHeight : 2160 # Input frame height
FramesToBeEncoded : 300 # Number of frames to be coded
Level : 5.1
-
-#======== Chroma QP scale =============
-WCGPPSEnable : 0 # enable WCG Chroma scale
-
-# ======== Luma adaptive QP ========
-LumaLevelToDeltaQPMode : 0 # Change luma delta QP based on average luma
-
diff --git a/cfg/per-sequence-HDR/H2_DayStreet_C2.cfg b/cfg/per-sequence-HDR/H2_DayStreet_C2.cfg
deleted file mode 100644
index 1ee6bf149..000000000
--- a/cfg/per-sequence-HDR/H2_DayStreet_C2.cfg
+++ /dev/null
@@ -1,18 +0,0 @@
-#======== File I/O ===============
-InputFile : DayStreet_3840x2160_60p_10bit_420_hlg.yuv
-InputBitDepth : 10 # Input bitdepth
-InputChromaFormat : 420 # Ratio of luminance to chrominance samples
-FrameRate : 60 # Frame Rate per second
-FrameSkip : 0 # Number of frames to be skipped in input
-SourceWidth : 3840 # Input frame width
-SourceHeight : 2160 # Input frame height
-FramesToBeEncoded : 600 # Number of frames to be coded
-
-Level : 5.1
-
-#======== Chroma QP scale =============
-WCGPPSEnable : 0 # enable WCG Chroma scale
-
-# ======== Luma adaptive QP ========
-LumaLevelToDeltaQPMode : 0 # Change luma delta QP based on average luma
-
diff --git a/cfg/per-sequence-HDR/H2_FlyingBirds2_C2.cfg b/cfg/per-sequence-HDR/H2_FlyingBirds2.cfg
similarity index 73%
rename from cfg/per-sequence-HDR/H2_FlyingBirds2_C2.cfg
rename to cfg/per-sequence-HDR/H2_FlyingBirds2.cfg
index f029fea88..18f8fb078 100644
--- a/cfg/per-sequence-HDR/H2_FlyingBirds2_C2.cfg
+++ b/cfg/per-sequence-HDR/H2_FlyingBirds2.cfg
@@ -9,10 +9,3 @@ SourceHeight : 2160 # Input frame height
FramesToBeEncoded : 300 # Number of frames to be coded
Level : 5.1
-
-#======== Chroma QP scale =============
-WCGPPSEnable : 0 # enable WCG Chroma scale
-
-# ======== Luma adaptive QP ========
-LumaLevelToDeltaQPMode : 0 # Change luma delta QP based on average luma
-
diff --git a/cfg/per-sequence-HDR/H2_PeopleInShoppingCenter.cfg b/cfg/per-sequence-HDR/H2_PeopleInShoppingCenter.cfg
index 67db9625a..9412ad683 100644
--- a/cfg/per-sequence-HDR/H2_PeopleInShoppingCenter.cfg
+++ b/cfg/per-sequence-HDR/H2_PeopleInShoppingCenter.cfg
@@ -9,10 +9,3 @@ SourceHeight : 2160 # Input frame height
FramesToBeEncoded : 300 # Number of frames to be coded
Level : 5.1
-
-#======== Chroma QP scale =============
-WCGPPSEnable : 0 # enable WCG Chroma scale
-
-# ======== Luma adaptive QP ========
-LumaLevelToDeltaQPMode : 0 # Change luma delta QP based on average luma
-
diff --git a/cfg/per-sequence-HDR/H2_PeopleInShoppingCenter_C2.cfg b/cfg/per-sequence-HDR/H2_PeopleInShoppingCenter_C2.cfg
deleted file mode 100644
index 18f585160..000000000
--- a/cfg/per-sequence-HDR/H2_PeopleInShoppingCenter_C2.cfg
+++ /dev/null
@@ -1,18 +0,0 @@
-#======== File I/O ===============
-InputFile : PeopleInShoppingCenter_3840x2160_60p_10bit_420_hlg.yuv
-InputBitDepth : 10 # Input bitdepth
-InputChromaFormat : 420 # Ratio of luminance to chrominance samples
-FrameRate : 60 # Frame Rate per second
-FrameSkip : 0 # Number of frames to be skipped in input
-SourceWidth : 3840 # Input frame width
-SourceHeight : 2160 # Input frame height
-FramesToBeEncoded : 600 # Number of frames to be coded
-
-Level : 5.1
-
-#======== Chroma QP scale =============
-WCGPPSEnable : 0 # enable WCG Chroma scale
-
-# ======== Luma adaptive QP ========
-LumaLevelToDeltaQPMode : 0 # Change luma delta QP based on average luma
-
diff --git a/cfg/per-sequence-HDR/H2_SunsetBeach2.cfg b/cfg/per-sequence-HDR/H2_SunsetBeach2.cfg
index 50fa5c609..c673c0e9e 100644
--- a/cfg/per-sequence-HDR/H2_SunsetBeach2.cfg
+++ b/cfg/per-sequence-HDR/H2_SunsetBeach2.cfg
@@ -9,9 +9,3 @@ SourceHeight : 2160 # Input frame height
FramesToBeEncoded : 300 # Number of frames to be coded
Level : 5.1
-
-#======== Chroma QP scale =============
-WCGPPSEnable : 0 # enable WCG Chroma scale
-
-# ======== Luma adaptive QP ========
-LumaLevelToDeltaQPMode : 0 # Change luma delta QP based on average luma
\ No newline at end of file
diff --git a/cfg/per-sequence-HDR/H2_SunsetBeach2_C2.cfg b/cfg/per-sequence-HDR/H2_SunsetBeach2_C2.cfg
deleted file mode 100644
index d85a66467..000000000
--- a/cfg/per-sequence-HDR/H2_SunsetBeach2_C2.cfg
+++ /dev/null
@@ -1,18 +0,0 @@
-#======== File I/O ===============
-InputFile : SunsetBeach2_3840x2160p_60_10b_HLG_420.yuv
-InputBitDepth : 10 # Input bitdepth
-InputChromaFormat : 420 # Ratio of luminance to chrominance samples
-FrameRate : 60 # Frame Rate per second
-FrameSkip : 0 # Number of frames to be skipped in input
-SourceWidth : 3840 # Input frame width
-SourceHeight : 2160 # Input frame height
-FramesToBeEncoded : 600 # Number of frames to be coded
-
-Level : 5.1
-
-#======== Chroma QP scale =============
-WCGPPSEnable : 0 # enable WCG Chroma scale
-
-# ======== Luma adaptive QP ========
-LumaLevelToDeltaQPMode : 0 # Change luma delta QP based on average luma
-
--
GitLab