update CTC test script
1. add new version of the excel template
2. update scaler script for framerate to match with HDRConvert
Change-Id: I87c88ed4e8668bf6239f4cb2b48090f7f9becbbe
diff --git a/tools/convexhull_framework/README.TXT b/tools/convexhull_framework/README.TXT
index 9868929..ab40115 100644
--- a/tools/convexhull_framework/README.TXT
+++ b/tools/convexhull_framework/README.TXT
@@ -10,11 +10,11 @@
Prerequisites
1. Inside ./bin folder, make sure you have executables for all external tools,
- such as vmaf(version v2.0.1+), HDRConvert, encoder, decoder, etc. You can get
+ such as vmaf(version v2.1.1+), HDRConvert, encoder, decoder, etc. You can get
the pre-build binaries or source code for the following tools that are needed:
- vmaf tools: https://github.com/Netflix/vmaf
- HDRConvert: https://gitlab.com/standards/HDRTools
- libaom AV1 encoder/decoder: https://aomedia.googlesource.com/aom/
+ vmaf tools: https://github.com/Netflix/vmaf/releases/tag/v2.1.1
+ HDRConvert: https://gitlab.com/standards/HDRTools 0.20-dev branch
+ libaom research branch encoder/decoder: https://aomedia.googlesource.com/aom/
SVT AV1 encoder: https://github.com/OpenVisualCloud/SVT-AV1
Please always follow the manual of these tools to update the command
parameters used in the script.
diff --git a/tools/convexhull_framework/bin/AV2Template_V8.xlsm b/tools/convexhull_framework/bin/AV2Template_V9.xlsm
similarity index 66%
rename from tools/convexhull_framework/bin/AV2Template_V8.xlsm
rename to tools/convexhull_framework/bin/AV2Template_V9.xlsm
index 448fa4a..84016e1 100644
--- a/tools/convexhull_framework/bin/AV2Template_V8.xlsm
+++ b/tools/convexhull_framework/bin/AV2Template_V9.xlsm
Binary files differ
diff --git a/tools/convexhull_framework/src/VideoScaler.py b/tools/convexhull_framework/src/VideoScaler.py
index 3f71d18..3155f41 100644
--- a/tools/convexhull_framework/src/VideoScaler.py
+++ b/tools/convexhull_framework/src/VideoScaler.py
@@ -52,7 +52,7 @@
if 'OutputHeight=' in line:
line = 'OutputHeight=%d\n' % outh
if 'SourceRate=' in line:
- line = 'SourceRate=%4.4f\n' % (float)(clip.fps_num / clip.fps_denom)
+ line = 'SourceRate=%4.3f\n' % (float)(clip.fps_num / clip.fps_denom)
if 'SourceChromaFormat=' in line:
line = 'SourceChromaFormat=%d\n' % fmt
if 'SourceBitDepthCmp0=' in line:
@@ -62,7 +62,7 @@
if 'SourceBitDepthCmp2=' in line:
line = 'SourceBitDepthCmp2=%d\n' % clip.bit_depth
if 'OutputRate=' in line:
- line = 'OutputRate=%4.4f\n' % (float)(clip.fps_num / clip.fps_denom)
+ line = 'OutputRate=%4.3f\n' % (float)(clip.fps_num / clip.fps_denom)
if 'OutputChromaFormat=' in line:
line = 'OutputChromaFormat=%d\n' % fmt
if 'OutputBitDepthCmp0=' in line:
