From 610950b406469471d96d491c6ceb5b71e9a12172 Mon Sep 17 00:00:00 2001
From: Shunsuke Iwamura <iwamura.s-gc@nhk.or.jp>
Date: Fri, 24 Jul 2020 08:18:14 +0900
Subject: [PATCH] Change configuration for ClassH2 CTC

---
 cfg/per-class/classH2.cfg                                       | 2 ++
 cfg/per-sequence-HDR/{H2_DayStreet.cfg => H2_DayStreet2.cfg}    | 2 +-
 .../{H2_FlyingBirds2.cfg => H2_FlyingBirds3.cfg}                | 2 +-
 ...eopleInShoppingCenter.cfg => H2_PeopleInShoppingCenter2.cfg} | 2 +-
 .../{H2_SunsetBeach2.cfg => H2_SunsetBeach3.cfg}                | 2 +-
 5 files changed, 6 insertions(+), 4 deletions(-)
 rename cfg/per-sequence-HDR/{H2_DayStreet.cfg => H2_DayStreet2.cfg} (87%)
 rename cfg/per-sequence-HDR/{H2_FlyingBirds2.cfg => H2_FlyingBirds3.cfg} (87%)
 rename cfg/per-sequence-HDR/{H2_PeopleInShoppingCenter.cfg => H2_PeopleInShoppingCenter2.cfg} (86%)
 rename cfg/per-sequence-HDR/{H2_SunsetBeach2.cfg => H2_SunsetBeach3.cfg} (87%)

diff --git a/cfg/per-class/classH2.cfg b/cfg/per-class/classH2.cfg
index 1792d27b2..10d266633 100644
--- a/cfg/per-class/classH2.cfg
+++ b/cfg/per-class/classH2.cfg
@@ -14,3 +14,5 @@ CrQpOffset                          : 0
 SameCQPTablesForAllChroma           : 1
 QpInValCb                           : 9 23 33 42
 QpOutValCb                          : 9 24 33 37
+
+VerCollocatedChroma           : 1
diff --git a/cfg/per-sequence-HDR/H2_DayStreet.cfg b/cfg/per-sequence-HDR/H2_DayStreet2.cfg
similarity index 87%
rename from cfg/per-sequence-HDR/H2_DayStreet.cfg
rename to cfg/per-sequence-HDR/H2_DayStreet2.cfg
index 99e77a0fe..a09ecfbba 100644
--- a/cfg/per-sequence-HDR/H2_DayStreet.cfg
+++ b/cfg/per-sequence-HDR/H2_DayStreet2.cfg
@@ -1,5 +1,5 @@
 #======== File I/O ===============
-InputFile                     : DayStreet_3840x2160_60p_10bit_420_hlg.yuv
+InputFile                     : DayStreet2_3840x2160_60p_10bit_420_hlg_type2.yuv
 InputBitDepth                 : 10          # Input bitdepth
 InputChromaFormat             : 420         # Ratio of luminance to chrominance samples
 FrameRate                     : 60          # Frame Rate per second
diff --git a/cfg/per-sequence-HDR/H2_FlyingBirds2.cfg b/cfg/per-sequence-HDR/H2_FlyingBirds3.cfg
similarity index 87%
rename from cfg/per-sequence-HDR/H2_FlyingBirds2.cfg
rename to cfg/per-sequence-HDR/H2_FlyingBirds3.cfg
index 18f8fb078..6a9036f3d 100644
--- a/cfg/per-sequence-HDR/H2_FlyingBirds2.cfg
+++ b/cfg/per-sequence-HDR/H2_FlyingBirds3.cfg
@@ -1,5 +1,5 @@
 #======== File I/O ===============
-InputFile                     : FlyingBirds2_3840x2160p_60_10b_HLG_420.yuv
+InputFile                     : FlyingBirds3_3840x2160p_60_10b_HLG_420_type2.yuv
 InputBitDepth                 : 10          # Input bitdepth
 InputChromaFormat             : 420         # Ratio of luminance to chrominance samples
 FrameRate                     : 60          # Frame Rate per second
diff --git a/cfg/per-sequence-HDR/H2_PeopleInShoppingCenter.cfg b/cfg/per-sequence-HDR/H2_PeopleInShoppingCenter2.cfg
similarity index 86%
rename from cfg/per-sequence-HDR/H2_PeopleInShoppingCenter.cfg
rename to cfg/per-sequence-HDR/H2_PeopleInShoppingCenter2.cfg
index 9412ad683..0892c746a 100644
--- a/cfg/per-sequence-HDR/H2_PeopleInShoppingCenter.cfg
+++ b/cfg/per-sequence-HDR/H2_PeopleInShoppingCenter2.cfg
@@ -1,5 +1,5 @@
 #======== File I/O ===============
-InputFile                     : PeopleInShoppingCenter_3840x2160_60p_10bit_420_hlg.yuv
+InputFile                     : PeopleInShoppingCenter2_3840x2160_60p_10bit_420_hlg_type2.yuv
 InputBitDepth                 : 10          # Input bitdepth
 InputChromaFormat             : 420         # Ratio of luminance to chrominance samples
 FrameRate                     : 60          # Frame Rate per second
diff --git a/cfg/per-sequence-HDR/H2_SunsetBeach2.cfg b/cfg/per-sequence-HDR/H2_SunsetBeach3.cfg
similarity index 87%
rename from cfg/per-sequence-HDR/H2_SunsetBeach2.cfg
rename to cfg/per-sequence-HDR/H2_SunsetBeach3.cfg
index c673c0e9e..a69676521 100644
--- a/cfg/per-sequence-HDR/H2_SunsetBeach2.cfg
+++ b/cfg/per-sequence-HDR/H2_SunsetBeach3.cfg
@@ -1,5 +1,5 @@
 #======== File I/O ===============
-InputFile                     : SunsetBeach2_3840x2160p_60_10b_HLG_420.yuv
+InputFile                     : SunsetBeach3_3840x2160p_60_10b_HLG_420_type2.yuv
 InputBitDepth                 : 10          # Input bitdepth
 InputChromaFormat             : 420         # Ratio of luminance to chrominance samples
 FrameRate                     : 60          # Frame Rate per second
-- 
GitLab