commit f9970a5dbd90ad68d3b12a83a781f64028aa8520
author Yushin Cho <ycho@mozilla.com> Fri Oct 13 12:57:13 2017 -0700
committer Yushin Cho <ycho@mozilla.com> Sat Oct 14 22:07:13 2017 +0000
tree bd7550d2ffaa1ec89f5c4da8c0601d262d59849d
parent 4c3c0f24669724df15e1e4abac9c6c3ed6dd4ab5

[dist-8x8] Modify 8x8 or larger partition size checking method

Since BLOCK_4X16 and BLOCK_16X4 are listed with higher enum value than BLOCK_8X8.

Change-Id: I36cdd4d33dfb2f3a01fa03c8eb8be26d8055dc43

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 62b00d8..6cd07e5 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -1909,8 +1909,10 @@
   // (new distortion metric) are different.
   // Exception is: dist-8x8 is enabled but still MSE is used,
   // i.e. "--tune=" encoder option is not used.
+  int bw = block_size_wide[plane_bsize];
+  int bh = block_size_high[plane_bsize];
   int disable_early_skip =
-      x->using_dist_8x8 && plane == 0 && plane_bsize >= BLOCK_8X8 &&
+      x->using_dist_8x8 && plane == 0 && bw >= 8 && bh >= 8 &&
       (tx_size == TX_4X4 || tx_size == TX_4X8 || tx_size == TX_8X4) &&
       x->tune_metric != AOM_TUNE_PSNR;
 #endif  // CONFIG_DIST_8X8
@@ -2159,9 +2161,11 @@
   av1_foreach_transformed_block_in_plane(xd, bsize, plane, block_rd_txfm,
                                          &args);
 #if CONFIG_DIST_8X8
-  if (x->using_dist_8x8 && !args.exit_early && plane == 0 &&
-      bsize >= BLOCK_8X8 &&
-      (tx_size == TX_4X4 || tx_size == TX_4X8 || tx_size == TX_8X4))
+  int bw = block_size_wide[bsize];
+  int bh = block_size_high[bsize];
+
+  if (x->using_dist_8x8 && !args.exit_early && plane == 0 && bw >= 8 &&
+      bh >= 8 && (tx_size == TX_4X4 || tx_size == TX_4X8 || tx_size == TX_8X4))
     dist_8x8_sub8x8_txfm_rd(cpi, x, bsize, &args);
 #endif
 
@@ -4612,8 +4616,10 @@
   const int buffer_length = tx_size_2d[tx_size];
   int64_t tmp_dist, tmp_sse;
 #if CONFIG_DIST_8X8
+  int blk_w = block_size_wide[plane_bsize];
+  int blk_h = block_size_high[plane_bsize];
   int disable_early_skip =
-      x->using_dist_8x8 && plane == 0 && plane_bsize >= BLOCK_8X8 &&
+      x->using_dist_8x8 && plane == 0 && blk_w >= 8 && blk_h >= 8 &&
       (tx_size == TX_4X4 || tx_size == TX_4X8 || tx_size == TX_8X4) &&
       x->tune_metric != AOM_TUNE_PSNR;
 #endif  // CONFIG_DIST_8X8