commit 26303146f1e57dc4d7ac5439cdd529ea5498cabf
author Debargha Mukherjee <debargha@google.com> Wed Feb 07 09:37:43 2018 -0800
committer Debargha Mukherjee <debargha@google.com> Wed Feb 07 21:30:15 2018 +0000
tree f2ab7d84a3705f18ebcee06b9971d9966cdd28fa
parent c3bb01893f38a043fb6c8058baf4ed761cea04b0

Turn LOWPRECISION_PRECISION off by default

It was left on mistakenly in a previous patch.

Change-Id: Ice2857740088517db7d91076b81830220a7b6dbc

av1/common/convolve.c

diff --git a/av1/common/convolve.c b/av1/common/convolve.c
index f32a62b..20a02cd 100644
--- a/av1/common/convolve.c
+++ b/av1/common/convolve.c
@@ -457,13 +457,11 @@
         res += y_filter[k] * src[(y - fo_vert + k) * src_stride + x];
       }
 #if CONFIG_LOWPRECISION_BLEND
-      if (bits >= 0)
-        res *= (1 << bits);
-      else
+      if (bits < 0)
         res = ROUND_POWER_OF_TWO(res, bits);
-#else
-      res *= (1 << bits);
+      else
 #endif  // CONFIG_LOWPRECISION_BLEND
+        res *= (1 << bits);
       if (conv_params->do_average)
         dst[y * dst_stride + x] += res;
       else
@@ -748,13 +746,11 @@
         res += y_filter[k] * src[(y - fo_vert + k) * src_stride + x];
       }
 #if CONFIG_LOWPRECISION_BLEND
-      if (bits >= 0)
-        res *= (1 << bits);
-      else
+      if (bits < 0)
         res = ROUND_POWER_OF_TWO(res, bits);
-#else
-      res *= (1 << bits);
+      else
 #endif  // CONFIG_LOWPRECISION_BLEND
+        res *= (1 << bits);
       if (conv_params->use_jnt_comp_avg) {
         if (conv_params->do_average) {
           dst[y * dst_stride + x] += res * conv_params->bck_offset;

build/cmake/aom_config_defaults.cmake

diff --git a/build/cmake/aom_config_defaults.cmake b/build/cmake/aom_config_defaults.cmake
index f80690f..b966183 100644
--- a/build/cmake/aom_config_defaults.cmake
+++ b/build/cmake/aom_config_defaults.cmake
@@ -129,7 +129,7 @@
 set(CONFIG_LOOPFILTERING_ACROSS_TILES_EXT 1 CACHE NUMBER "AV1 experiment flag.")
 set(CONFIG_LOOPFILTER_LEVEL 1 CACHE NUMBER "AV1 experiment flag.")
 set(CONFIG_LOOP_RESTORATION 1 CACHE NUMBER "AV1 experiment flag.")
-set(CONFIG_LOWPRECISION_BLEND 1 CACHE NUMBER "AV1 experiment flag.")
+set(CONFIG_LOWPRECISION_BLEND 0 CACHE NUMBER "AV1 experiment flag.")
 set(CONFIG_LV_MAP 1 CACHE NUMBER "AV1 experiment flag.")
 set(CONFIG_MAX_TILE 1 CACHE NUMBER "AV1 experiment flag.")
 set(CONFIG_MFMV 1 CACHE NUMBER "AV1 experiment flag.")