commit 1cd346211597e98e51564086374c4aafa9a58fc5
author Yushin Cho <ycho@mozilla.com> Fri Oct 06 13:00:41 2017 -0700
committer Yushin Cho <ycho@mozilla.com> Tue Oct 17 20:33:42 2017 +0000
tree c6e3af93f39441b1a3ba6563b7eeb5c69e70363a
parent 0c7eb10dba78c541f06d848173dcd46f2251479e

[dist-8x8] Add more asserts

Added more asserts for dist-8x8 running in PSNR mode,
i.e. with the encoder option "--enable-dist-8x8=1"
instead of --tune=[cdef-dist | daala-dist].

The asserts checks whether a 8x8 distortion measured on reconstructed 8x8 pixels
is identical to the sum of distortions from sub8x8 partitions (or tx blocks for
var-tx case).

Change-Id: I14f2b24e674a9cbbe60e663449fc4e7f46f0e481

av1/encoder/encodeframe.c

diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index ba34f9f..6d14daa 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -3004,6 +3004,7 @@
         int64_t dist_8x8;
         dist_8x8 =
             dist_8x8_yuv(cpi, x, x->plane[0].src.buf - 4 * src_stride - 4);
+        if (x->tune_metric == AOM_TUNE_PSNR) assert(sum_rdc.dist == dist_8x8);
         sum_rdc.dist = dist_8x8;
         sum_rdc.rdcost = RDCOST(x->rdmult, sum_rdc.rate, sum_rdc.dist);
       }
@@ -3095,6 +3096,7 @@
         const int src_stride = x->plane[0].src.stride;
         int64_t dist_8x8;
         dist_8x8 = dist_8x8_yuv(cpi, x, x->plane[0].src.buf - 4 * src_stride);
+        if (x->tune_metric == AOM_TUNE_PSNR) assert(sum_rdc.dist == dist_8x8);
         sum_rdc.dist = dist_8x8;
         sum_rdc.rdcost = RDCOST(x->rdmult, sum_rdc.rate, sum_rdc.dist);
       }
@@ -3178,6 +3180,7 @@
           bsize == BLOCK_8X8) {
         int64_t dist_8x8;
         dist_8x8 = dist_8x8_yuv(cpi, x, x->plane[0].src.buf - 4);
+        if (x->tune_metric == AOM_TUNE_PSNR) assert(sum_rdc.dist == dist_8x8);
         sum_rdc.dist = dist_8x8;
         sum_rdc.rdcost = RDCOST(x->rdmult, sum_rdc.rate, sum_rdc.dist);
       }

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 6698244..3087c0d 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -5126,6 +5126,7 @@
       dist_8x8 = av1_dist_8x8(cpi, x, src, src_stride, dst, dst_stride,
                               BLOCK_8X8, 8, 8, 8, 8, qindex) *
                  16;
+      if (x->tune_metric == AOM_TUNE_PSNR) assert(sum_rd_stats.sse == dist_8x8);
       sum_rd_stats.sse = dist_8x8;
 
 #if CONFIG_HIGHBITDEPTH
@@ -5183,6 +5184,8 @@
       dist_8x8 = av1_dist_8x8(cpi, x, src, src_stride, pred8, 8, BLOCK_8X8, 8,
                               8, 8, 8, qindex) *
                  16;
+      if (x->tune_metric == AOM_TUNE_PSNR)
+        assert(sum_rd_stats.dist == dist_8x8);
       sum_rd_stats.dist = dist_8x8;
       tmp_rd = RDCOST(x->rdmult, sum_rd_stats.rate, sum_rd_stats.dist);
     }