commit 0233da474d6fcfe076756695e3ae712e7b8eea48
author Yue Chen <yuec@google.com> Mon Aug 12 16:45:15 2019 -0700
committer Yue Chen <yuec@google.com> Tue Aug 13 04:02:22 2019 +0000
tree 93d66fc94a9c0af26c9e069b8021f6f925691d81
parent fc1404d58cf32d8ae853fafcd36fb6445bf5914f

Add 6:1:1 weighted PSNR to opsnr.stt

Change-Id: Ica012c959eef7f4405bfe58bf57145c21f2b8bd5

av1/encoder/encoder.c

diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c
index d5349d6..a3450e6 100644
--- a/av1/encoder/encoder.c
+++ b/av1/encoder/encoder.c
@@ -3087,12 +3087,12 @@
                  "Bitrate\tAVGPsnr\tGLBPsnr\tAVPsnrP\tGLPsnrP\t"
                  "AOMSSIM\tVPSSIMP\tFASTSIM\tPSNRHVS\t"
                  "WstPsnr\tWstSsim\tWstFast\tWstHVS\t"
-                 "AVPsrnY\tAPsnrCb\tAPsnrCr");
+                 "AVPsrnY\tAPsnrCb\tAPsnrCr\tAPsnr611");
         snprintf(results, sizeof(results),
                  "%7.2f\t%7.3f\t%7.3f\t%7.3f\t%7.3f\t"
                  "%7.3f\t%7.3f\t%7.3f\t%7.3f\t"
                  "%7.3f\t%7.3f\t%7.3f\t%7.3f\t"
-                 "%7.3f\t%7.3f\t%7.3f",
+                 "%7.3f\t%7.3f\t%7.3f\t%7.3f",
                  dr, cpi->psnr.stat[STAT_ALL] / cpi->count, total_psnr,
                  cpi->psnr.stat[STAT_ALL] / cpi->count, total_psnr, total_ssim,
                  total_ssim, cpi->fastssim.stat[STAT_ALL] / cpi->count,
@@ -3100,7 +3100,10 @@
                  cpi->worst_ssim, cpi->fastssim.worst, cpi->psnrhvs.worst,
                  cpi->psnr.stat[STAT_Y] / cpi->count,
                  cpi->psnr.stat[STAT_U] / cpi->count,
-                 cpi->psnr.stat[STAT_V] / cpi->count);
+                 cpi->psnr.stat[STAT_V] / cpi->count,
+                 (6 * cpi->psnr.stat[STAT_Y] + cpi->psnr.stat[STAT_U] +
+                  cpi->psnr.stat[STAT_V]) /
+                     (cpi->count * 8));
 
         if (cpi->b_calculate_blockiness) {
           SNPRINT(headings, "\t  Block\tWstBlck");