Merge HIGHPRECISION_INTBUF into LOWPRECISION_BLEND
The HIGHPRECISION_INTBUF=1 enables round_0 to be 3.
This is now merged into the LOWPRECISION_BLEND flags
for ease of management.
Change-Id: Ia336f24ea87d824d7034012cfed9c4c3129bf6eb
diff --git a/av1/common/convolve.h b/av1/common/convolve.h
index 7d4ae42..f3e0dcd 100644
--- a/av1/common/convolve.h
+++ b/av1/common/convolve.h
@@ -43,13 +43,11 @@
#endif
} ConvolveParams;
-#define ROUND0_BITS (5 - 2 * (CONFIG_HIGHPRECISION_INTBUF))
-
-#if CONFIG_LOWPRECISION_BLEND == 1
-#define COMPOUND_ROUND1_BITS (4 + 2 * (CONFIG_HIGHPRECISION_INTBUF))
-#elif CONFIG_LOWPRECISION_BLEND == 2
-#define COMPOUND_ROUND1_BITS (5 + 2 * (CONFIG_HIGHPRECISION_INTBUF))
+#if CONFIG_LOWPRECISION_BLEND
+#define ROUND0_BITS 3
+#define COMPOUND_ROUND1_BITS (5 + CONFIG_LOWPRECISION_BLEND)
#else
+#define ROUND0_BITS 5
#define COMPOUND_ROUND1_BITS 0
#endif // CONFIG_LOWPRECISION_BLEND
diff --git a/build/cmake/aom_config_defaults.cmake b/build/cmake/aom_config_defaults.cmake
index 284b2a7..92d9ae1 100644
--- a/build/cmake/aom_config_defaults.cmake
+++ b/build/cmake/aom_config_defaults.cmake
@@ -120,7 +120,6 @@
set(CONFIG_FRAME_SIZE 1 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_FWD_KF 0 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_HASH_ME 0 CACHE NUMBER "AV1 experiment flag.")
-set(CONFIG_HIGHPRECISION_INTBUF 1 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_HORZONLY_FRAME_SUPERRES 1 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_INTER_STATS_ONLY 0 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_INTRABC 1 CACHE NUMBER "AV1 experiment flag.")
