commit 52ac004c6644f5268fb20fa6060c3a47b28316e2
author chiyotsai <chiyotsai@google.com> Mon Jul 01 09:48:03 2019 -0700
committer Chi Yo Tsai <chiyotsai@google.com> Mon Jul 01 23:50:26 2019 +0000
tree e83d9a01463b7d7709c7b3c949cb1e520087cb34
parent a9e7b071676d67f608f83dc3957a9faa38e5a96c

Fix multithread mismatch due to intra cnn partitioning

This prevents an edge case where uninitialized outputs from CNN are used
to determine intra-frame partitioning.

STATS_CHANGED

BUG=aomedia:2424

Change-Id: I102a25e5a715d55462a1db59b806187897a9f11c

av1/encoder/block.h

diff --git a/av1/encoder/block.h b/av1/encoder/block.h
index 363deca..72a59e0 100644
--- a/av1/encoder/block.h
+++ b/av1/encoder/block.h
@@ -413,6 +413,7 @@
 
 #if !CONFIG_REALTIME_ONLY
   int quad_tree_idx;
+  int cnn_output_valid;
   float cnn_buffer[CNN_OUT_BUF_SIZE];
   float log_q;
 #endif

av1/encoder/encodeframe.c

diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index 256916a..a6fefb4 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -2370,6 +2370,7 @@
 
   if (frame_is_intra_only(cm) && bsize == BLOCK_64X64) {
     x->quad_tree_idx = 0;
+    x->cnn_output_valid = 0;
   }
 
   if (bsize == cm->seq_params.sb_size) x->must_find_valid_partition = 0;
@@ -4007,6 +4008,9 @@
         !frame_is_intra_only(cm) && !use_nonrd_mode) {
       init_simple_motion_search_mvs(pc_root);
     }
+#if !CONFIG_REALTIME_ONLY
+    td->mb.cnn_output_valid = 0;
+#endif
 
     xd->cur_frame_force_integer_mv = cm->cur_frame_force_integer_mv;
 

av1/encoder/partition_strategy.c

diff --git a/av1/encoder/partition_strategy.c b/av1/encoder/partition_strategy.c
index c63dbae..f16532a 100644
--- a/av1/encoder/partition_strategy.c
+++ b/av1/encoder/partition_strategy.c
@@ -64,7 +64,7 @@
   const int bsize_idx = convert_bsize_to_idx(bsize);
 
   // Precompute the CNN part and cache the result in MACROBLOCK
-  if (bsize == BLOCK_64X64) {
+  if (bsize == BLOCK_64X64 && !x->cnn_output_valid) {
     aom_clear_system_state();
     const CNN_CONFIG *cnn_config = &av1_intra_mode_cnn_partition_cnn_config;
 
@@ -121,6 +121,12 @@
       av1_cnn_predict_img_multi_out(image, width, height, stride, cnn_config,
                                     &thread_data, &output);
     }
+
+    x->cnn_output_valid = 1;
+  }
+
+  if (!x->cnn_output_valid) {
+    return;
   }
 
   const NN_CONFIG *dnn_configs[5] = {