commit d07b3506b44f01a768c11f6acfc3da66ee34b2e4
author Sai Deng <sdeng@google.com> Fri Feb 19 10:22:42 2021 -0800
committer Sai Deng <sdeng@google.com> Tue Feb 23 19:07:46 2021 +0000
tree 61abc2b93400f87860cd6744042aef8592d27256
parent 285a54746239e5108852154ac7f052d73f45ca34

Retune the model

Results are based on Butteraugli from JXL v0.3.2
The build is using libjxl v0.3.2 (with a API bug fix)

BD-rate reduction, baseline tune=psnr:
Google HDR+ 153 images JPG test set
psnr    ssim     butteraugli
5.179%  -2.902%  -19.450%

BUG=aomedia:2965

Change-Id: I1f4e7b52c814bbb82b759b21a52a4a6bc1490cae

av1/encoder/tune_butteraugli.c

diff --git a/av1/encoder/tune_butteraugli.c b/av1/encoder/tune_butteraugli.c
index 9468eea..4d5866a 100644
--- a/av1/encoder/tune_butteraugli.c
+++ b/av1/encoder/tune_butteraugli.c
@@ -93,7 +93,7 @@
       dmse = dmse / (2.0f * (float)block_w * (float)block_h);
       // 'K' is used to balance the rate-distortion distribution between PSNR
       // and Butteraugli.
-      const double K = 0.28;
+      const double K = 0.2;
       const float eps = 0.01f;
       double weight;
       if (dbutteraugli < eps || dmse < eps) {
@@ -101,7 +101,7 @@
       } else {
         blk_count += 1.0;
         weight = dmse / dbutteraugli;
-        weight = AOMMIN(weight, 4.0);
+        weight = AOMMIN(weight, 3.0);
         weight += K;
         log_sum += log(weight);
       }