Skip to content
Snippets Groups Projects
Commit 0a2f0e34 authored by Frank Bossen's avatar Frank Bossen
Browse files

Merge branch 'master' into 'N0435-WAIP-Harmonization' 

# Conflicts:
#   source/Lib/CommonLib/TypeDef.h
parents 893e9ca4 c957162c
No related branches found
No related tags found
1 merge request!450JVET-N0435: WAIP Harmonization
Hide whitespace changes
Inline Side-by-side
Showing
with 32 additions and 151 deletions
cfg/encoder_intra_vtm.cfg
+ 2
− 0
View file @ 0a2f0e34
......@@ -79,6 +79,7 @@ CbQpOffset : 1
CrQpOffset : 1
TemporalSubsampleRatio : 8
ReWriteParamSets : 1
#============ NEXT ====================
# General
......@@ -97,6 +98,7 @@ MTS : 1
MTSIntraMaxCand : 3
MTSInterMaxCand : 4
SBT : 1
ISP : 1
Affine : 1
SubPuMvp : 1
MaxNumMergeCand : 6
......
cfg/encoder_lowdelay_P_vtm.cfg
+ 2
− 0
View file @ 0a2f0e34
......@@ -95,6 +95,7 @@ SEIDecodedPictureHash : 0
CbQpOffset : 1
CrQpOffset : 1
ReWriteParamSets : 1
#============ NEXT ====================
# General
......@@ -113,6 +114,7 @@ MTS : 1
MTSIntraMaxCand : 3
MTSInterMaxCand : 4
SBT : 1
ISP : 1
Affine : 1
SubPuMvp : 1
MaxNumMergeCand : 6
......
cfg/encoder_lowdelay_vtm.cfg
+ 3
− 0
View file @ 0a2f0e34
......@@ -95,6 +95,7 @@ SEIDecodedPictureHash : 0
CbQpOffset : 1
CrQpOffset : 1
ReWriteParamSets : 1
#============ NEXT ====================
# General
......@@ -113,6 +114,8 @@ MTS : 1
MTSIntraMaxCand : 3
MTSInterMaxCand : 4
SBT : 1
ISP : 1
MMVD : 1
Affine : 1
SubPuMvp : 1
MaxNumMergeCand : 6
......
cfg/encoder_randomaccess_vtm.cfg
+ 3
− 0
View file @ 0a2f0e34
......@@ -109,6 +109,7 @@ SEIDecodedPictureHash : 0
CbQpOffset : 1
CrQpOffset : 1
ReWriteParamSets : 1
#============ NEXT ====================
# General
......@@ -127,6 +128,8 @@ MTS : 1
MTSIntraMaxCand : 3
MTSInterMaxCand : 4
SBT : 1
ISP : 1
MMVD : 1
Affine : 1
SubPuMvp : 1
MaxNumMergeCand : 6
......
cfg/per-class/classH1.cfg 0 → 100644
+ 13
− 0
View file @ 0a2f0e34
# ======== 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
cfg/per-class/classH2.cfg 0 → 100644
+ 9
− 0
View file @ 0a2f0e34
# ======== 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
cfg/per-sequence-HDR/H1_BalloonFestival.cfg
+ 0
− 12
View file @ 0a2f0e34
......@@ -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
cfg/per-sequence-HDR/H1_Cosmos1_TreeTrunk.cfg
+ 0
− 7
View file @ 0a2f0e34
......@@ -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
cfg/per-sequence-HDR/H1_EBU_Hurdles.cfg
+ 0
− 11
View file @ 0a2f0e34
......@@ -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
cfg/per-sequence-HDR/H1_EBU_Starting.cfg
+ 0
− 11
View file @ 0a2f0e34
......@@ -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
cfg/per-sequence-HDR/H1_Market.cfg
+ 0
− 11
View file @ 0a2f0e34
......@@ -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
cfg/per-sequence-HDR/H1_ShowGirl.cfg
+ 0
− 7
View file @ 0a2f0e34
......@@ -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
cfg/per-sequence-HDR/H1_SunRise.cfg
+ 0
− 11
View file @ 0a2f0e34
......@@ -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
cfg/per-sequence-HDR/H2_DayStreet.cfg
+ 0
− 7
View file @ 0a2f0e34
......@@ -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
cfg/per-sequence-HDR/H2_DayStreet_C2.cfg deleted 100644 → 0
+ 0
− 18
View file @ 893e9ca4
#======== 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
cfg/per-sequence-HDR/H2_FlyingBirds2_C2.cfg → cfg/per-sequence-HDR/H2_FlyingBirds2.cfg
+ 0
− 7
View file @ 0a2f0e34
......@@ -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
cfg/per-sequence-HDR/H2_PeopleInShoppingCenter.cfg
+ 0
− 7
View file @ 0a2f0e34
......@@ -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
cfg/per-sequence-HDR/H2_PeopleInShoppingCenter_C2.cfg deleted 100644 → 0
+ 0
− 18
View file @ 893e9ca4
#======== 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
cfg/per-sequence-HDR/H2_SunsetBeach2.cfg
+ 0
− 6
View file @ 0a2f0e34
......@@ -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
cfg/per-sequence-HDR/H2_SunsetBeach2_C2.cfg deleted 100644 → 0
+ 0
− 18
View file @ 893e9ca4
#======== 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
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment