Get several experiments to build together
This commit fixes several issues that prevent experiments to build
when enabled together. The experiments are:
ec-adapt
ext-inter
ext-partition
BUG=aomedia:80
BUG=aomedia:88
Change-Id: I5b790f16ad0ae2450f0be3aa26329b6a57a6a5c5
diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
index 49f3c9b..5edc851 100644
--- a/av1/decoder/decodeframe.c
+++ b/av1/decoder/decodeframe.c
@@ -171,7 +171,6 @@
#endif
}
-#if !CONFIG_EC_ADAPT
#if CONFIG_EXT_INTER
static void read_inter_compound_mode_probs(FRAME_CONTEXT *fc, aom_reader *r) {
int i, j;
@@ -184,6 +183,7 @@
}
}
#endif // CONFIG_EXT_INTER
+#if !CONFIG_EC_ADAPT
#if !CONFIG_EXT_TX
static void read_ext_tx_probs(FRAME_CONTEXT *fc, aom_reader *r) {
int i, j, k;
diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 57d99a1..712c00f 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -335,8 +335,7 @@
for (i = 0; i < n - 1; ++i)
av1_cond_prob_diff_update(w, &probs[i], branch_ct[i], probwt);
}
-
-#if !CONFIG_EC_ADAPT
+#if CONFIG_EXT_INTER || CONFIG_EXT_TX || !CONFIG_EC_ADAPT
static int prob_diff_update_savings(const aom_tree_index *tree,
aom_prob probs[/*n - 1*/],
const unsigned int counts[/*n - 1*/], int n,
@@ -354,7 +353,7 @@
}
return savings;
}
-#endif
+#endif // CONFIG_EXT_INTER || CONFIG_EXT_TX || !CONFIG_EC_ADAPT
#if CONFIG_VAR_TX
static void write_tx_size_vartx(const AV1_COMMON *cm, const MACROBLOCKD *xd,
diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index abbcc7e..4de60ef 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -3154,7 +3154,7 @@
1,
4,
4,
- 6
+ 6,
#if CONFIG_EXT_PARTITION
// TODO(debargha): What are the correct numbers here?
8,
