commit d50be4c7310d208db1e4ecc67df4d6d48d12af61
author bohanli <bohanli@google.com> Wed Jan 08 18:47:58 2020 -0800
committer Bohan Li <bohanli@google.com> Thu Jan 09 17:04:26 2020 +0000
tree 5e795b002d5631cbee1d482bb15b599762bd6449
parent 5c072210bdb09874505568374d1c8c0a99722944

Fix a bug in interpolation for intrabc that causes data race.

Previously there was the possibility that when one of the
dimensions requires no interpolation, the implementation still
reads the 2-tap sources (though not used) and causes a potential
data race.

This patch separates the two when applicable.

BUG=b/145993032

Change-Id: I0b119efa482945f106346897a136046d83d3eece

av1/common/convolve.c

diff --git a/av1/common/convolve.c b/av1/common/convolve.c
index 1504611..f73fd21 100644
--- a/av1/common/convolve.c
+++ b/av1/common/convolve.c
@@ -573,11 +573,21 @@
   if (filter_params_x->taps == 2 || filter_params_y->taps == 2) {
     assert(filter_params_x->taps == 2 && filter_params_y->taps == 2);
     assert(!scaled);
-    if (subpel_x_qn || subpel_y_qn) {
+    if (subpel_x_qn && subpel_y_qn) {
       av1_convolve_2d_sr_c(src, src_stride, dst, dst_stride, w, h,
                            filter_params_x, filter_params_y, subpel_x_qn,
                            subpel_y_qn, conv_params);
       return;
+    } else if (subpel_x_qn) {
+      av1_convolve_x_sr_c(src, src_stride, dst, dst_stride, w, h,
+                          filter_params_x, filter_params_y, subpel_x_qn,
+                          subpel_y_qn, conv_params);
+      return;
+    } else if (subpel_y_qn) {
+      av1_convolve_y_sr_c(src, src_stride, dst, dst_stride, w, h,
+                          filter_params_x, filter_params_y, subpel_x_qn,
+                          subpel_y_qn, conv_params);
+      return;
     }
   }