Commit 17fd2f23 authored by Yaowu Xu's avatar Yaowu Xu

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
parent 33f210c6
......@@ -171,7 +171,6 @@ static void read_inter_mode_probs(FRAME_CONTEXT *fc, aom_reader *r) {
#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 @@ static void read_inter_compound_mode_probs(FRAME_CONTEXT *fc, aom_reader *r) {
}
}
#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;
......
......@@ -335,8 +335,7 @@ static void prob_diff_update(const aom_tree_index *tree,
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 @@ static int prob_diff_update_savings(const aom_tree_index *tree,
}
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,
......
......@@ -3154,7 +3154,7 @@ const int complexity_16x16_blocks_threshold[BLOCK_SIZES] = {
1,
4,
4,
6
6,
#if CONFIG_EXT_PARTITION
// TODO(debargha): What are the correct numbers here?
8,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment