Commit a59b23dd authored by Nathan E. Egge's avatar Nathan E. Egge Committed by Nathan Egge

Use inter_mode_cdf with CONFIG_EC_MULTISYMBOL.

Change-Id: I1cf27d2f029c1e985cafb468f60e7117d92593f5
parent 00b3331e
...@@ -585,8 +585,10 @@ static const aom_prob default_delta_q_probs[DELTA_Q_CONTEXTS] = { 220, 220, ...@@ -585,8 +585,10 @@ static const aom_prob default_delta_q_probs[DELTA_Q_CONTEXTS] = { 220, 220,
#endif #endif
int av1_intra_mode_ind[INTRA_MODES]; int av1_intra_mode_ind[INTRA_MODES];
int av1_intra_mode_inv[INTRA_MODES]; int av1_intra_mode_inv[INTRA_MODES];
#if CONFIG_EC_MULTISYMBOL
int av1_inter_mode_ind[INTER_MODES]; int av1_inter_mode_ind[INTER_MODES];
int av1_inter_mode_inv[INTER_MODES]; int av1_inter_mode_inv[INTER_MODES];
#endif
/* Array indices are identical to previously-existing INTRAMODECONTEXTNODES. */ /* Array indices are identical to previously-existing INTRAMODECONTEXTNODES. */
#if CONFIG_ALT_INTRA #if CONFIG_ALT_INTRA
...@@ -1775,8 +1777,6 @@ static void init_mode_probs(FRAME_CONTEXT *fc) { ...@@ -1775,8 +1777,6 @@ static void init_mode_probs(FRAME_CONTEXT *fc) {
BLOCK_SIZE_GROUPS); BLOCK_SIZE_GROUPS);
av1_tree_to_cdf_1D(av1_intra_mode_tree, fc->uv_mode_prob, fc->uv_mode_cdf, av1_tree_to_cdf_1D(av1_intra_mode_tree, fc->uv_mode_prob, fc->uv_mode_cdf,
INTRA_MODES); INTRA_MODES);
av1_tree_to_cdf_1D(av1_inter_mode_tree, fc->inter_mode_probs,
fc->inter_mode_cdf, INTER_MODE_CONTEXTS);
av1_tree_to_cdf_2D(av1_intra_mode_tree, av1_kf_y_mode_prob, av1_kf_y_mode_cdf, av1_tree_to_cdf_2D(av1_intra_mode_tree, av1_kf_y_mode_prob, av1_kf_y_mode_cdf,
INTRA_MODES, INTRA_MODES); INTRA_MODES, INTRA_MODES);
#endif #endif
...@@ -1785,6 +1785,8 @@ static void init_mode_probs(FRAME_CONTEXT *fc) { ...@@ -1785,6 +1785,8 @@ static void init_mode_probs(FRAME_CONTEXT *fc) {
fc->switchable_interp_cdf, SWITCHABLE_FILTER_CONTEXTS); fc->switchable_interp_cdf, SWITCHABLE_FILTER_CONTEXTS);
av1_tree_to_cdf_1D(av1_partition_tree, fc->partition_prob, fc->partition_cdf, av1_tree_to_cdf_1D(av1_partition_tree, fc->partition_prob, fc->partition_cdf,
PARTITION_CONTEXTS); PARTITION_CONTEXTS);
av1_tree_to_cdf_1D(av1_inter_mode_tree, fc->inter_mode_probs,
fc->inter_mode_cdf, INTER_MODE_CONTEXTS);
#if !CONFIG_EXT_TX #if !CONFIG_EXT_TX
av1_tree_to_cdf_2D(av1_ext_tx_tree, fc->intra_ext_tx_prob, av1_tree_to_cdf_2D(av1_ext_tx_tree, fc->intra_ext_tx_prob,
fc->intra_ext_tx_cdf, EXT_TX_SIZES, TX_TYPES); fc->intra_ext_tx_cdf, EXT_TX_SIZES, TX_TYPES);
...@@ -1818,6 +1820,10 @@ void av1_set_mode_cdfs(struct AV1Common *cm) { ...@@ -1818,6 +1820,10 @@ void av1_set_mode_cdfs(struct AV1Common *cm) {
av1_tree_to_cdf(av1_switchable_interp_tree, fc->switchable_interp_prob[j], av1_tree_to_cdf(av1_switchable_interp_tree, fc->switchable_interp_prob[j],
fc->switchable_interp_cdf[j]); fc->switchable_interp_cdf[j]);
for (i = 0; i < INTER_MODE_CONTEXTS; ++i)
av1_tree_to_cdf(av1_inter_mode_tree, fc->inter_mode_probs[i],
fc->inter_mode_cdf[i]);
#if !CONFIG_EXT_TX #if !CONFIG_EXT_TX
for (i = TX_4X4; i < EXT_TX_SIZES; ++i) for (i = TX_4X4; i < EXT_TX_SIZES; ++i)
for (j = 0; j < TX_TYPES; ++j) for (j = 0; j < TX_TYPES; ++j)
...@@ -1838,10 +1844,6 @@ void av1_set_mode_cdfs(struct AV1Common *cm) { ...@@ -1838,10 +1844,6 @@ void av1_set_mode_cdfs(struct AV1Common *cm) {
av1_tree_to_cdf(av1_intra_mode_tree, cm->kf_y_prob[i][j], av1_tree_to_cdf(av1_intra_mode_tree, cm->kf_y_prob[i][j],
cm->kf_y_cdf[i][j]); cm->kf_y_cdf[i][j]);
for (i = 0; i < INTER_MODE_CONTEXTS; ++i)
av1_tree_to_cdf(av1_inter_mode_tree, fc->inter_mode_probs[i],
fc->inter_mode_cdf[i]);
for (i = 0; i < BLOCK_SIZE_GROUPS; ++i) for (i = 0; i < BLOCK_SIZE_GROUPS; ++i)
av1_tree_to_cdf(av1_intra_mode_tree, fc->y_mode_prob[i], fc->y_mode_cdf[i]); av1_tree_to_cdf(av1_intra_mode_tree, fc->y_mode_prob[i], fc->y_mode_cdf[i]);
......
...@@ -168,12 +168,12 @@ typedef struct frame_contexts { ...@@ -168,12 +168,12 @@ typedef struct frame_contexts {
#if CONFIG_DAALA_EC #if CONFIG_DAALA_EC
aom_cdf_prob y_mode_cdf[BLOCK_SIZE_GROUPS][INTRA_MODES]; aom_cdf_prob y_mode_cdf[BLOCK_SIZE_GROUPS][INTRA_MODES];
aom_cdf_prob uv_mode_cdf[INTRA_MODES][INTRA_MODES]; aom_cdf_prob uv_mode_cdf[INTRA_MODES][INTRA_MODES];
aom_cdf_prob inter_mode_cdf[INTER_MODE_CONTEXTS][INTER_MODES];
#endif #endif
#if CONFIG_EC_MULTISYMBOL #if CONFIG_EC_MULTISYMBOL
aom_cdf_prob partition_cdf[PARTITION_CONTEXTS][PARTITION_TYPES]; aom_cdf_prob partition_cdf[PARTITION_CONTEXTS][PARTITION_TYPES];
aom_cdf_prob switchable_interp_cdf[SWITCHABLE_FILTER_CONTEXTS] aom_cdf_prob switchable_interp_cdf[SWITCHABLE_FILTER_CONTEXTS]
[SWITCHABLE_FILTERS]; [SWITCHABLE_FILTERS];
aom_cdf_prob inter_mode_cdf[INTER_MODE_CONTEXTS][INTER_MODES];
#if !CONFIG_EXT_TX #if !CONFIG_EXT_TX
aom_cdf_prob intra_ext_tx_cdf[EXT_TX_SIZES][TX_TYPES][TX_TYPES]; aom_cdf_prob intra_ext_tx_cdf[EXT_TX_SIZES][TX_TYPES][TX_TYPES];
aom_cdf_prob inter_ext_tx_cdf[EXT_TX_SIZES][TX_TYPES]; aom_cdf_prob inter_ext_tx_cdf[EXT_TX_SIZES][TX_TYPES];
...@@ -310,6 +310,8 @@ extern const aom_tree_index av1_inter_mode_tree[TREE_SIZE(INTER_MODES)]; ...@@ -310,6 +310,8 @@ extern const aom_tree_index av1_inter_mode_tree[TREE_SIZE(INTER_MODES)];
#if CONFIG_DAALA_EC #if CONFIG_DAALA_EC
extern int av1_intra_mode_ind[INTRA_MODES]; extern int av1_intra_mode_ind[INTRA_MODES];
extern int av1_intra_mode_inv[INTRA_MODES]; extern int av1_intra_mode_inv[INTRA_MODES];
#endif
#if CONFIG_EC_MULTISYMBOL
extern int av1_inter_mode_ind[INTER_MODES]; extern int av1_inter_mode_ind[INTER_MODES];
extern int av1_inter_mode_inv[INTER_MODES]; extern int av1_inter_mode_inv[INTER_MODES];
#endif #endif
......
...@@ -196,7 +196,7 @@ static PREDICTION_MODE read_inter_mode(AV1_COMMON *cm, MACROBLOCKD *xd, ...@@ -196,7 +196,7 @@ static PREDICTION_MODE read_inter_mode(AV1_COMMON *cm, MACROBLOCKD *xd,
// Invalid prediction mode. // Invalid prediction mode.
assert(0); assert(0);
#else #else
#if CONFIG_DAALA_EC #if CONFIG_EC_MULTISYMBOL
const int mode = av1_inter_mode_inv[aom_read_symbol( const int mode = av1_inter_mode_inv[aom_read_symbol(
r, cm->fc->inter_mode_cdf[ctx], INTER_MODES, ACCT_STR)]; r, cm->fc->inter_mode_cdf[ctx], INTER_MODES, ACCT_STR)];
#else #else
......
...@@ -53,8 +53,6 @@ static void initialize_dec(void) { ...@@ -53,8 +53,6 @@ static void initialize_dec(void) {
#if CONFIG_DAALA_EC #if CONFIG_DAALA_EC
av1_indices_from_tree(av1_intra_mode_ind, av1_intra_mode_inv, INTRA_MODES, av1_indices_from_tree(av1_intra_mode_ind, av1_intra_mode_inv, INTRA_MODES,
av1_intra_mode_tree); av1_intra_mode_tree);
av1_indices_from_tree(av1_inter_mode_ind, av1_inter_mode_inv, INTER_MODES,
av1_inter_mode_tree);
#endif #endif
#if CONFIG_EC_MULTISYMBOL #if CONFIG_EC_MULTISYMBOL
av1_indices_from_tree(av1_switchable_interp_ind, av1_switchable_interp_inv, av1_indices_from_tree(av1_switchable_interp_ind, av1_switchable_interp_inv,
...@@ -63,6 +61,8 @@ static void initialize_dec(void) { ...@@ -63,6 +61,8 @@ static void initialize_dec(void) {
av1_indices_from_tree(av1_ext_tx_ind, av1_ext_tx_inv, TX_TYPES, av1_indices_from_tree(av1_ext_tx_ind, av1_ext_tx_inv, TX_TYPES,
av1_ext_tx_tree); av1_ext_tx_tree);
#endif #endif
av1_indices_from_tree(av1_inter_mode_ind, av1_inter_mode_inv, INTER_MODES,
av1_inter_mode_tree);
#endif #endif
} }
} }
......
...@@ -197,6 +197,8 @@ void av1_encode_token_init(void) { ...@@ -197,6 +197,8 @@ void av1_encode_token_init(void) {
#if CONFIG_DAALA_EC #if CONFIG_DAALA_EC
av1_indices_from_tree(av1_intra_mode_ind, av1_intra_mode_inv, INTRA_MODES, av1_indices_from_tree(av1_intra_mode_ind, av1_intra_mode_inv, INTRA_MODES,
av1_intra_mode_tree); av1_intra_mode_tree);
#endif
#if CONFIG_EC_MULTISYMBOL
av1_indices_from_tree(av1_inter_mode_ind, av1_inter_mode_inv, INTER_MODES, av1_indices_from_tree(av1_inter_mode_ind, av1_inter_mode_inv, INTER_MODES,
av1_inter_mode_tree); av1_inter_mode_tree);
#endif #endif
...@@ -262,7 +264,7 @@ static void write_inter_mode(AV1_COMMON *cm, aom_writer *w, ...@@ -262,7 +264,7 @@ static void write_inter_mode(AV1_COMMON *cm, aom_writer *w,
} }
#else #else
assert(is_inter_mode(mode)); assert(is_inter_mode(mode));
#if CONFIG_DAALA_EC #if CONFIG_EC_MULTISYMBOL
aom_write_symbol(w, av1_inter_mode_ind[INTER_OFFSET(mode)], aom_write_symbol(w, av1_inter_mode_ind[INTER_OFFSET(mode)],
cm->fc->inter_mode_cdf[mode_ctx], INTER_MODES); cm->fc->inter_mode_cdf[mode_ctx], INTER_MODES);
#else #else
......
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