Remove multiple options for LOWPRECISION_BLEND
Previsouly CONFIG_LOWPRECISION_BLEND could be set as 1 or 2
to experiment with two different options, but 2 was what was
adopted. This patch removes the old 1 option and makes
CONFIG_LOWPRECISION_BLEND=1 work the way the adopted tool
is supposed to behave for consistency with the other tools and
avoid confusion.
To continue experiments with other options one will need to manually
change the macros ROUND0_BITS or COMPOUND_ROUND1_BITS in
common/convolve.h.
Change-Id: I6e5434bbce1e655380a35cb1b530c912c5145560
diff --git a/av1/common/convolve.h b/av1/common/convolve.h
index 6500efb..d3c84ff 100644
--- a/av1/common/convolve.h
+++ b/av1/common/convolve.h
@@ -44,7 +44,7 @@
#if CONFIG_LOWPRECISION_BLEND
#define ROUND0_BITS 3
-#define COMPOUND_ROUND1_BITS (5 + CONFIG_LOWPRECISION_BLEND)
+#define COMPOUND_ROUND1_BITS 7
#else
#define ROUND0_BITS 5
#define COMPOUND_ROUND1_BITS 0
diff --git a/build/cmake/aom_config_defaults.cmake b/build/cmake/aom_config_defaults.cmake
index ae35d02..48a429e 100644
--- a/build/cmake/aom_config_defaults.cmake
+++ b/build/cmake/aom_config_defaults.cmake
@@ -124,7 +124,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 2 CACHE NUMBER "AV1 experiment flag.")
+set(CONFIG_LOWPRECISION_BLEND 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.")
set(CONFIG_MONO_VIDEO 1 CACHE NUMBER "AV1 experiment flag.")
