commit dbfec2a81641b3f5ed30e4499b73b3794515ab92
author Angie Chiang <angiebird@google.com> Wed Feb 01 15:04:59 2017 -0800
committer Angie Chiang <angiebird@google.com> Thu Feb 02 17:40:40 2017 +0000
tree f7d6a46657d3709106c86ecf626522410b362b61
parent c957af9c1dc28bd76c05781f68d18458e92c2852

Add convolve-round experiment

Change-Id: I02a019b1c11b3ee4ae32d424cb6ef2f8ae554824

av1/common/reconinter.c

diff --git a/av1/common/reconinter.c b/av1/common/reconinter.c
index 575c4c9..fe6e85f 100644
--- a/av1/common/reconinter.c
+++ b/av1/common/reconinter.c
@@ -917,9 +917,9 @@
     uint8_t *pre[2];
     MV32 scaled_mv[2];
     SubpelParams subpel_params[2];
-#if CONVOLVE_POST_ROUNDING
+#if CONFIG_CONVOLVE_ROUND
     int32_t tmp_dst[MAX_SB_SIZE * MAX_SB_SIZE];
-#endif  // CONVOLVE_POST_ROUNDING
+#endif  // CONFIG_CONVOLVE_ROUND
 
     for (ref = 0; ref < 1 + is_compound; ++ref) {
       const struct scale_factors *const sf = &xd->block_refs[ref]->sf;
@@ -971,12 +971,12 @@
     for (ref = 0; ref < 1 + is_compound; ++ref) {
       const struct scale_factors *const sf = &xd->block_refs[ref]->sf;
       struct buf_2d *const pre_buf = &pd->pre[ref];
-#if CONVOLVE_POST_ROUNDING
+#if CONFIG_CONVOLVE_ROUND
       ConvolveParams conv_params =
           get_conv_params_no_round(ref, tmp_dst, MAX_SB_SIZE);
 #else
       ConvolveParams conv_params = get_conv_params(ref);
-#endif  // CONVOLVE_POST_ROUNDING
+#endif  // CONFIG_CONVOLVE_ROUND
 #if CONFIG_EXT_INTER
       if (ref &&
           is_masked_compound_type(mi->mbmi.interinter_compound_data.type))
@@ -1009,7 +1009,7 @@
             subpel_params[ref].xs, subpel_params[ref].ys, xd);
     }
 
-#if CONVOLVE_POST_ROUNDING
+#if CONFIG_CONVOLVE_ROUND
 // TODO(angiebird): This part needs optimization
 #if CONFIG_AOM_HIGHBITDEPTH
     if (!(xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH))
@@ -1017,7 +1017,7 @@
 #else
     av1_convolve_rounding(tmp_dst, MAX_SB_SIZE, dst, dst_buf->stride, w, h);
 #endif
-#endif  // CONVOLVE_POST_ROUNDING
+#endif  // CONFIG_CONVOLVE_ROUND
   }
 }