From 40e81f3243969e1f63bd4068b907f0da2160aa37 Mon Sep 17 00:00:00 2001 From: Ari Lemmetti Date: Wed, 15 Apr 2020 01:22:33 +0300 Subject: [PATCH] Update preset tables. Update docs. --- README.md | 12 ++++++------ doc/kvazaar.1 | 2 +- src/cfg.c | 38 +++++++++++++++++++------------------- tests/test_interlace.sh | 2 +- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/README.md b/README.md index db4241e2..c874fc95 100644 --- a/README.md +++ b/README.md @@ -337,16 +337,16 @@ where the names have been abbreviated to fit the layout in GitHub. | | 0-uf | 1-sf | 2-vf | 3-fr | 4-f | 5-m | 6-s | 7-sr | 8-vs | 9-p | | -------------------- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | -| rd | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 2 | 2 | 2 | +| rd | 0 | 0 | 0 | 0 | 0 | 0 | 1 | 2 | 2 | 2 | | pu-depth-intra | 2-3 | 2-3 | 2-3 | 2-3 | 1-3 | 1-4 | 1-4 | 1-4 | 1-4 | 1-4 | -| pu-depth-inter | 2-3 | 2-3 | 1-3 | 1-3 | 1-3 | 0-3 | 0-3 | 0-3 | 0-3 | 0-3 | +| pu-depth-inter | 1-2 | 1-2 | 1-3 | 1-3 | 1-3 | 0-3 | 0-3 | 0-3 | 0-3 | 0-3 | | me | hexbs | hexbs | hexbs | hexbs | hexbs | hexbs | hexbs | hexbs | tz | tz | -| gop | g4d4t1| g4d4t1| g4d4t1| g4d4t1| g4d4t1| 8 | 8 | 8 | 16 | 16 | +| gop | 8 | 8 | 8 | 8 | 8 | 16 | 16 | 16 | 16 | 16 | | ref | 1 | 1 | 1 | 1 | 2 | 4 | 4 | 4 | 4 | 4 | -| bipred | 0 | 0 | 0 | 0 | 0 | 0 | 1 | 1 | 1 | 1 | +| bipred | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | | deblock | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | | signhide | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 1 | 1 | 1 | -| subme | 2 | 2 | 2 | 4 | 4 | 4 | 4 | 4 | 4 | 4 | +| subme | 0 | 2 | 2 | 4 | 4 | 4 | 4 | 4 | 4 | 4 | | sao | off | full | full | full | full | full | full | full | full | full | | rdoq | 0 | 0 | 0 | 0 | 0 | 1 | 1 | 1 | 1 | 1 | | rdoq-skip | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | @@ -358,7 +358,7 @@ where the names have been abbreviated to fit the layout in GitHub. | cu-split-termination | zero | zero | zero | zero | zero | zero | zero | zero | zero | off | | me-early-termination | sens. | sens. | sens. | sens. | sens. | on | on | off | off | off | | intra-rdo-et | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | -| early-skip | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | +| early-skip | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 0 | | fast-residual-cost | 28 | 28 | 28 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | | max-merge | 5 | 5 | 5 | 5 | 5 | 5 | 5 | 5 | 5 | 5 | diff --git a/doc/kvazaar.1 b/doc/kvazaar.1 index a829d671..c539438a 100644 --- a/doc/kvazaar.1 +++ b/doc/kvazaar.1 @@ -196,7 +196,7 @@ Used with \-\-level. Use high tier bitrate limits instead of the main tier limits during encoding. High tier requires level 4 or higher. .TP -\fB\-\-(no\-)vaq +\fB\-\-(no\-)vaq Enable variance adaptive quantization with given strength, in range 1..20. Recommended: 5. [disabled] diff --git a/src/cfg.c b/src/cfg.c index e6d6427b..e147e64f 100644 --- a/src/cfg.c +++ b/src/cfg.c @@ -454,14 +454,14 @@ int kvz_config_parse(kvz_config *cfg, const char *name, const char *value) "ultrafast", "rd", "0", "pu-depth-intra", "2-3", - "pu-depth-inter", "2-3", + "pu-depth-inter", "1-2", "me", "hexbs", - "gop", "lp-g4d4t1", + "gop", "8", "ref", "1", - "bipred", "0", + "bipred", "1", "deblock", "0:0", "signhide", "0", - "subme", "2", + "subme", "0", "sao", "off", "rdoq", "0", "rdoq-skip", "0", @@ -482,11 +482,11 @@ int kvz_config_parse(kvz_config *cfg, const char *name, const char *value) "superfast", "rd", "0", "pu-depth-intra", "2-3", - "pu-depth-inter", "2-3", + "pu-depth-inter", "1-2", "me", "hexbs", - "gop", "lp-g4d4t1", + "gop", "8", "ref", "1", - "bipred", "0", + "bipred", "1", "deblock", "0:0", "signhide", "0", "subme", "2", @@ -512,9 +512,9 @@ int kvz_config_parse(kvz_config *cfg, const char *name, const char *value) "pu-depth-intra", "2-3", "pu-depth-inter", "1-3", "me", "hexbs", - "gop", "lp-g4d4t1", + "gop", "8", "ref", "1", - "bipred", "0", + "bipred", "1", "deblock", "0:0", "signhide", "0", "subme", "2", @@ -540,9 +540,9 @@ int kvz_config_parse(kvz_config *cfg, const char *name, const char *value) "pu-depth-intra", "2-3", "pu-depth-inter", "1-3", "me", "hexbs", - "gop", "lp-g4d4t1", + "gop", "8", "ref", "1", - "bipred", "0", + "bipred", "1", "deblock", "0:0", "signhide", "0", "subme", "4", @@ -568,9 +568,9 @@ int kvz_config_parse(kvz_config *cfg, const char *name, const char *value) "pu-depth-intra", "1-3", "pu-depth-inter", "1-3", "me", "hexbs", - "gop", "lp-g4d4t1", + "gop", "8", "ref", "2", - "bipred", "0", + "bipred", "1", "deblock", "0:0", "signhide", "0", "subme", "4", @@ -596,9 +596,9 @@ int kvz_config_parse(kvz_config *cfg, const char *name, const char *value) "pu-depth-intra", "1-4", "pu-depth-inter", "0-3", "me", "hexbs", - "gop", "8", + "gop", "16", "ref", "4", - "bipred", "0", + "bipred", "1", "deblock", "0:0", "signhide", "0", "subme", "4", @@ -620,11 +620,11 @@ int kvz_config_parse(kvz_config *cfg, const char *name, const char *value) }, { "slow", - "rd", "0", + "rd", "1", "pu-depth-intra", "1-4", "pu-depth-inter", "0-3", "me", "hexbs", - "gop", "8", + "gop", "16", "ref", "4", "bipred", "1", "deblock", "0:0", @@ -652,7 +652,7 @@ int kvz_config_parse(kvz_config *cfg, const char *name, const char *value) "pu-depth-intra", "1-4", "pu-depth-inter", "0-3", "me", "hexbs", - "gop", "8", + "gop", "16", "ref", "4", "bipred", "1", "deblock", "0:0", @@ -725,7 +725,7 @@ int kvz_config_parse(kvz_config *cfg, const char *name, const char *value) "cu-split-termination", "off", "me-early-termination", "off", "intra-rdo-et", "0", - "early-skip", "1", + "early-skip", "0", "fast-residual-cost", "0", "max-merge", "5", NULL diff --git a/tests/test_interlace.sh b/tests/test_interlace.sh index 3a61e842..1baac061 100755 --- a/tests/test_interlace.sh +++ b/tests/test_interlace.sh @@ -3,4 +3,4 @@ set -eu . "${0%/*}/util.sh" -valgrind_test 264x130 10 --source-scan-type=tff -p0 --preset=ultrafast --threads=2 --owf=1 --wpp +valgrind_test 264x130 10 --source-scan-type=tff -p0 --preset=ultrafast --threads=2 --owf=1 --wpp --gop=0