update CTC test script
1. update the scaling config file template to match with latest HDR tool
implementation.
2. update CTC excel template
Change-Id: Ib9a038b72b57d04c77f78816709e063ccd4f197f
diff --git a/tools/convexhull_framework/bin/AV2Template_V7.xlsm b/tools/convexhull_framework/bin/AV2Template_V7.xlsm
deleted file mode 100644
index 68b92fb..0000000
--- a/tools/convexhull_framework/bin/AV2Template_V7.xlsm
+++ /dev/null
Binary files differ
diff --git a/tools/convexhull_framework/bin/AV2Template_V8.xlsm b/tools/convexhull_framework/bin/AV2Template_V8.xlsm
new file mode 100644
index 0000000..448fa4a
--- /dev/null
+++ b/tools/convexhull_framework/bin/AV2Template_V8.xlsm
Binary files differ
diff --git a/tools/convexhull_framework/bin/HDRConvScalerY4MFile.cfg b/tools/convexhull_framework/bin/HDRConvScalerY4MFile.cfg
index 466ae7f..87a8c5a 100644
--- a/tools/convexhull_framework/bin/HDRConvScalerY4MFile.cfg
+++ b/tools/convexhull_framework/bin/HDRConvScalerY4MFile.cfg
@@ -6,6 +6,10 @@
# Input/output file parameters
#
###############################################################################
+ScaleOnly=1
+ScalingMode=12
+
+NumberOfFrames=1 # number of frames to process
SourceFile="D:\YUVs\AV2-CTC\a1_4k\Crosswalk_3840x2160_5994fps_10bit_420.y4m"
OutputFile="Crosswalk_1920x1080_5994fps_10bit_420.y4m" # Scaled YUV file
@@ -13,9 +17,9 @@
SourceHeight=2160 # input frame height
OutputWidth=1920 # input frame height
OutputHeight=1080 # input frame height
-ScalingMode=3 # Scaling Filter Mode
-LanczosLobes=5
SourceRate=59.94 # input frame rate
+OutputRate=59.94 # output frame rate
+
SourceInterleaved=0 # Interleaved or Planar data
SourceChromaFormat=1 # Input chroma format
# 0 : 400
@@ -42,8 +46,7 @@
# 2: P3D60
# 3: P3D65
# 4: None
-SourceTransferFunction=0
-OutputRate=59.94 # output frame rate
+SourceTransferFunction=12
OutputChromaFormat=1 # Output Chroma format
# 0 : 400
# 1 : 420
@@ -63,26 +66,12 @@
# 3: P3D65
# 4: None
-NumberOfFrames=1 # number of frames to process
InputFileHeader=0 # Input File header to be skipped (in bytes).
StartFrame=0 # Number of frames to skip before start
SilentMode=1 # Enable Silent mode
-OutputTransferFunction=0 # Transfer Function
+OutputTransferFunction=12 # Transfer Function
# 0: NULL (no new TF applied)
# 1: PQ
# 2: PH
-
-USeSingleTransferStep=1 # Use a single step or two step process for the application of the PQ TF
-TransformPrecision=0 # Use fixed (0) or high precision for color transform
-ChromaDownsampleFilter=6 # 444 to 420 conversion filters
- # 0: Nearest Neighbor
- # 1: Bilinear
- # 2: H={1, 6, 1} and V={1, 1}
- # 3: H={1, 2, 1} and V={1, 1}
-ChromaUpsampleFilter=0 # 420 to 444 conversion filters
- # 0 : Nearest Neighbor
- # 1 : 4-tap in w14548
-SetOutputSinglePrec=0 # Set OpenEXR output file precision
- # 0: HALF, 1: SINGLE
\ No newline at end of file
diff --git a/tools/convexhull_framework/src/VideoScaler.py b/tools/convexhull_framework/src/VideoScaler.py
index 50ee5abd..3f71d18 100644
--- a/tools/convexhull_framework/src/VideoScaler.py
+++ b/tools/convexhull_framework/src/VideoScaler.py
@@ -51,10 +51,6 @@
line = 'OutputWidth=%d\n' % outw
if 'OutputHeight=' in line:
line = 'OutputHeight=%d\n' % outh
- if 'ScalingMode=' in line:
- line = 'ScalingMode=3\n'
- if 'LanczosLobes=' in line:
- line = 'LanczosLobes=5\n'
if 'SourceRate=' in line:
line = 'SourceRate=%4.4f\n' % (float)(clip.fps_num / clip.fps_denom)
if 'SourceChromaFormat=' in line:
