Update inter_mode_cdf tables once per frame. Move computing the inter_mode_cdf tables per coded inter mode symbol to computing them only when the probabilities are updated. Change-Id: I7a7b059ee75723cb6f278ed82a20cf34c27915d8
diff --git a/av1/common/entropymode.c b/av1/common/entropymode.c index 6d90972..e812f15 100644 --- a/av1/common/entropymode.c +++ b/av1/common/entropymode.c
@@ -373,6 +373,8 @@ #endif int av1_intra_mode_ind[INTRA_MODES]; int av1_intra_mode_inv[INTRA_MODES]; +int av1_inter_mode_ind[INTER_MODES]; +int av1_inter_mode_inv[INTER_MODES]; /* Array indices are identical to previously-existing INTRAMODECONTEXTNODES. */ const aom_tree_index av1_intra_mode_tree[TREE_SIZE(INTRA_MODES)] = { @@ -1417,12 +1419,14 @@ INTRA_MODES); av1_tree_to_cdf_1D(av1_switchable_interp_tree, fc->switchable_interp_prob, fc->switchable_interp_cdf, SWITCHABLE_FILTER_CONTEXTS); + av1_tree_to_cdf_1D(av1_partition_tree, fc->partition_prob, fc->partition_cdf, + PARTITION_CONTEXTS); + 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_ext_tx_tree, fc->intra_ext_tx_prob, fc->intra_ext_tx_cdf, EXT_TX_SIZES, TX_TYPES); av1_tree_to_cdf_1D(av1_ext_tx_tree, fc->inter_ext_tx_prob, fc->inter_ext_tx_cdf, EXT_TX_SIZES); - av1_tree_to_cdf_1D(av1_partition_tree, fc->partition_prob, fc->partition_cdf, - PARTITION_CONTEXTS); av1_tree_to_cdf_2D(av1_intra_mode_tree, av1_kf_y_mode_prob, av1_kf_y_mode_cdf, INTRA_MODES, INTRA_MODES); av1_tree_to_cdf(av1_segment_tree, fc->seg.tree_probs, fc->seg.tree_cdf);
diff --git a/av1/common/entropymode.h b/av1/common/entropymode.h index 142d364..3043114 100644 --- a/av1/common/entropymode.h +++ b/av1/common/entropymode.h
@@ -170,6 +170,7 @@ aom_cdf_prob partition_cdf[PARTITION_CONTEXTS][PARTITION_TYPES]; aom_cdf_prob switchable_interp_cdf[SWITCHABLE_FILTER_CONTEXTS] [SWITCHABLE_FILTERS]; + aom_cdf_prob inter_mode_cdf[INTER_MODE_CONTEXTS][INTER_MODES]; 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]; #endif @@ -302,6 +303,8 @@ #if CONFIG_DAALA_EC extern int av1_intra_mode_ind[INTRA_MODES]; extern int av1_intra_mode_inv[INTRA_MODES]; +extern int av1_inter_mode_ind[INTER_MODES]; +extern int av1_inter_mode_inv[INTER_MODES]; #endif #if CONFIG_EXT_INTER extern const aom_tree_index
diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c index 44921ee..fb36f35 100644 --- a/av1/decoder/decodeframe.c +++ b/av1/decoder/decodeframe.c
@@ -134,9 +134,14 @@ #endif // CONFIG_EXT_INTER #else int j; - for (i = 0; i < INTER_MODE_CONTEXTS; ++i) + for (i = 0; i < INTER_MODE_CONTEXTS; ++i) { for (j = 0; j < INTER_MODES - 1; ++j) av1_diff_update_prob(r, &fc->inter_mode_probs[i][j], ACCT_STR); +#if CONFIG_DAALA_EC + av1_tree_to_cdf(av1_inter_mode_tree, fc->inter_mode_probs[i], + fc->inter_mode_cdf[i]); +#endif + } #endif }
diff --git a/av1/decoder/decodemv.c b/av1/decoder/decodemv.c index a632fc0..3cfec47 100644 --- a/av1/decoder/decodemv.c +++ b/av1/decoder/decodemv.c
@@ -190,8 +190,13 @@ // Invalid prediction mode. assert(0); #else +#if CONFIG_DAALA_EC + const int mode = av1_inter_mode_inv[aom_read_symbol( + r, cm->fc->inter_mode_cdf[ctx], INTER_MODES, ACCT_STR)]; +#else const int mode = aom_read_tree(r, av1_inter_mode_tree, cm->fc->inter_mode_probs[ctx], ACCT_STR); +#endif FRAME_COUNTS *counts = xd->counts; if (counts) ++counts->inter_mode[ctx][mode];
diff --git a/av1/decoder/decoder.c b/av1/decoder/decoder.c index ca97817..bcc6a1b 100644 --- a/av1/decoder/decoder.c +++ b/av1/decoder/decoder.c
@@ -54,6 +54,8 @@ av1_ext_tx_tree); av1_indices_from_tree(av1_intra_mode_ind, av1_intra_mode_inv, INTRA_MODES, av1_intra_mode_tree); + av1_indices_from_tree(av1_inter_mode_ind, av1_inter_mode_inv, INTER_MODES, + av1_inter_mode_tree); #endif } }
diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c index 12e581c..131cf79 100644 --- a/av1/encoder/bitstream.c +++ b/av1/encoder/bitstream.c
@@ -194,6 +194,8 @@ av1_ext_tx_tree); av1_indices_from_tree(av1_intra_mode_ind, av1_intra_mode_inv, INTRA_MODES, av1_intra_mode_tree); + av1_indices_from_tree(av1_inter_mode_ind, av1_inter_mode_inv, INTER_MODES, + av1_inter_mode_tree); #endif } @@ -256,10 +258,17 @@ } } #else - const aom_prob *const inter_probs = cm->fc->inter_mode_probs[mode_ctx]; assert(is_inter_mode(mode)); - av1_write_token(w, av1_inter_mode_tree, inter_probs, - &inter_mode_encodings[INTER_OFFSET(mode)]); +#if CONFIG_DAALA_EC + aom_write_symbol(w, av1_inter_mode_ind[INTER_OFFSET(mode)], + cm->fc->inter_mode_cdf[mode_ctx], INTER_MODES); +#else + { + const aom_prob *const inter_probs = cm->fc->inter_mode_probs[mode_ctx]; + av1_write_token(w, av1_inter_mode_tree, inter_probs, + &inter_mode_encodings[INTER_OFFSET(mode)]); + } +#endif #endif } @@ -3677,9 +3686,14 @@ #if CONFIG_REF_MV update_inter_mode_probs(cm, header_bc, counts); #else - for (i = 0; i < INTER_MODE_CONTEXTS; ++i) + for (i = 0; i < INTER_MODE_CONTEXTS; ++i) { prob_diff_update(av1_inter_mode_tree, cm->fc->inter_mode_probs[i], counts->inter_mode[i], INTER_MODES, header_bc); +#if CONFIG_DAALA_EC + av1_tree_to_cdf(av1_inter_mode_tree, cm->fc->inter_mode_probs[i], + cm->fc->inter_mode_cdf[i]); +#endif + } #endif #if CONFIG_EXT_INTER