NEW_MULTISYMBOL: adapt remaining INTERINTRA syntax elements.
AWCY, objective-1-fast, High Latency :
-0.14% all metrics with NEW_MULTISYMBOL on (reference
with NEW_MULTISYMBOL off).
Change-Id: I7cb3d05977d5e424fd38a40ab558c87c5d811f14
diff --git a/av1/common/entropy.c b/av1/common/entropy.c
index 9ad28e6..18a7edd 100644
--- a/av1/common/entropy.c
+++ b/av1/common/entropy.c
@@ -5716,6 +5716,10 @@
AVERAGE_TILE_CDFS(compound_type_cdf)
#if CONFIG_INTERINTRA
+#if CONFIG_NEW_MULTISYMBOL
+ AVERAGE_TILE_CDFS(interintra_cdf)
+ AVERAGE_TILE_CDFS(wedge_interintra_cdf)
+#endif
AVERAGE_TILE_CDFS(interintra_mode_cdf)
#endif
diff --git a/av1/common/entropymode.c b/av1/common/entropymode.c
index 8308c02..4169ad4 100644
--- a/av1/common/entropymode.c
+++ b/av1/common/entropymode.c
@@ -1226,6 +1226,14 @@
static const aom_prob default_interintra_prob[BLOCK_SIZE_GROUPS] = {
208, 208, 208, 208,
};
+#if CONFIG_NEW_MULTISYMBOL
+static const aom_cdf_prob default_interintra_cdf[BLOCK_SIZE_GROUPS][CDF_SIZE(
+ 2)] = { { AOM_ICDF(208 * 128), AOM_ICDF(32768), 0 },
+ { AOM_ICDF(208 * 128), AOM_ICDF(32768), 0 },
+ { AOM_ICDF(208 * 128), AOM_ICDF(32768), 0 },
+ { AOM_ICDF(208 * 128), AOM_ICDF(32768), 0 } };
+#endif
+
static const aom_prob
default_interintra_mode_prob[BLOCK_SIZE_GROUPS][INTERINTRA_MODES - 1] = {
{ 88, 16, 150 }, // block_size < 8x8
@@ -1254,6 +1262,35 @@
#endif // CONFIG_EXT_PARTITION
};
+#if CONFIG_NEW_MULTISYMBOL
+static const aom_cdf_prob
+ default_wedge_interintra_cdf[BLOCK_SIZES][CDF_SIZE(2)] = {
+#if CONFIG_CHROMA_2X2 || CONFIG_CHROMA_SUB8X8
+ { AOM_ICDF(208 * 128), AOM_ICDF(32768), 0 },
+ { AOM_ICDF(208 * 128), AOM_ICDF(32768), 0 },
+ { AOM_ICDF(208 * 128), AOM_ICDF(32768), 0 },
+#endif
+ { AOM_ICDF(208 * 128), AOM_ICDF(32768), 0 },
+ { AOM_ICDF(208 * 128), AOM_ICDF(32768), 0 },
+ { AOM_ICDF(208 * 128), AOM_ICDF(32768), 0 },
+ { AOM_ICDF(208 * 128), AOM_ICDF(32768), 0 },
+ { AOM_ICDF(208 * 128), AOM_ICDF(32768), 0 },
+ { AOM_ICDF(208 * 128), AOM_ICDF(32768), 0 },
+ { AOM_ICDF(216 * 128), AOM_ICDF(32768), 0 },
+ { AOM_ICDF(216 * 128), AOM_ICDF(32768), 0 },
+ { AOM_ICDF(216 * 128), AOM_ICDF(32768), 0 },
+ { AOM_ICDF(224 * 128), AOM_ICDF(32768), 0 },
+ { AOM_ICDF(224 * 128), AOM_ICDF(32768), 0 },
+ { AOM_ICDF(224 * 128), AOM_ICDF(32768), 0 },
+ { AOM_ICDF(240 * 128), AOM_ICDF(32768), 0 },
+#if CONFIG_EXT_PARTITION
+ { AOM_ICDF(208 * 128), AOM_ICDF(32768), 0 },
+ { AOM_ICDF(208 * 128), AOM_ICDF(32768), 0 },
+ { AOM_ICDF(208 * 128), AOM_ICDF(32768), 0 },
+#endif // CONFIG_EXT_PARTITION
+ };
+#endif // CONFIG_NEW_MULTISYMBOL
+
#endif // CONFIG_INTERINTRA
#endif // CONFIG_EXT_INTER
@@ -4880,6 +4917,10 @@
#if CONFIG_INTERINTRA
av1_copy(fc->interintra_prob, default_interintra_prob);
av1_copy(fc->wedge_interintra_prob, default_wedge_interintra_prob);
+#if CONFIG_NEW_MULTISYMBOL
+ av1_copy(fc->interintra_cdf, default_interintra_cdf);
+ av1_copy(fc->wedge_interintra_cdf, default_wedge_interintra_cdf);
+#endif // CONFIG_NEW_MULTISYMBOL
av1_copy(fc->interintra_mode_prob, default_interintra_mode_prob);
#if CONFIG_EC_ADAPT
av1_copy(fc->interintra_mode_cdf, default_interintra_mode_cdf);
diff --git a/av1/common/entropymode.h b/av1/common/entropymode.h
index bc44017..ab8596e 100644
--- a/av1/common/entropymode.h
+++ b/av1/common/entropymode.h
@@ -212,6 +212,10 @@
aom_prob wedge_interintra_prob[BLOCK_SIZES];
aom_prob interintra_mode_prob[BLOCK_SIZE_GROUPS][INTERINTRA_MODES - 1];
#if CONFIG_EC_ADAPT
+#if CONFIG_NEW_MULTISYMBOL
+ aom_cdf_prob interintra_cdf[BLOCK_SIZE_GROUPS][CDF_SIZE(2)];
+ aom_cdf_prob wedge_interintra_cdf[BLOCK_SIZES][CDF_SIZE(2)];
+#endif
aom_cdf_prob interintra_mode_cdf[BLOCK_SIZE_GROUPS]
[CDF_SIZE(INTERINTRA_MODES)];
#endif
diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
index 0b61a90..5578d43 100644
--- a/av1/decoder/decodeframe.c
+++ b/av1/decoder/decodeframe.c
@@ -5112,18 +5112,20 @@
#if CONFIG_INTERINTRA
if (cm->reference_mode != COMPOUND_REFERENCE &&
cm->allow_interintra_compound) {
+#if !CONFIG_NEW_MULTISYMBOL
for (i = 0; i < BLOCK_SIZE_GROUPS; i++) {
if (is_interintra_allowed_bsize_group(i)) {
av1_diff_update_prob(&r, &fc->interintra_prob[i], ACCT_STR);
}
}
+#endif
#if !CONFIG_EC_ADAPT
for (i = 0; i < BLOCK_SIZE_GROUPS; i++) {
for (j = 0; j < INTERINTRA_MODES - 1; j++)
av1_diff_update_prob(&r, &fc->interintra_mode_prob[i][j], ACCT_STR);
}
#endif
-#if CONFIG_WEDGE
+#if CONFIG_WEDGE && !CONFIG_NEW_MULTISYMBOL
for (i = 0; i < BLOCK_SIZES; i++) {
if (is_interintra_allowed_bsize(i) && is_interintra_wedge_used(i)) {
av1_diff_update_prob(&r, &fc->wedge_interintra_prob[i], ACCT_STR);
diff --git a/av1/decoder/decodemv.c b/av1/decoder/decodemv.c
index a37b940..be7a591 100644
--- a/av1/decoder/decodemv.c
+++ b/av1/decoder/decodemv.c
@@ -2559,8 +2559,13 @@
#endif
cm->allow_interintra_compound && is_interintra_allowed(mbmi)) {
const int bsize_group = size_group_lookup[bsize];
+#if CONFIG_NEW_MULTISYMBOL
+ const int interintra =
+ aom_read_symbol(r, ec_ctx->interintra_cdf[bsize_group], 2, ACCT_STR);
+#else
const int interintra =
aom_read(r, cm->fc->interintra_prob[bsize_group], ACCT_STR);
+#endif
if (xd->counts) xd->counts->interintra[bsize_group][interintra]++;
assert(mbmi->ref_frame[1] == NONE_FRAME);
if (interintra) {
@@ -2580,8 +2585,13 @@
mbmi->filter_intra_mode_info.use_filter_intra_mode[1] = 0;
#endif // CONFIG_FILTER_INTRA
if (is_interintra_wedge_used(bsize)) {
+#if CONFIG_NEW_MULTISYMBOL
+ mbmi->use_wedge_interintra = aom_read_symbol(
+ r, ec_ctx->wedge_interintra_cdf[bsize], 2, ACCT_STR);
+#else
mbmi->use_wedge_interintra =
aom_read(r, cm->fc->wedge_interintra_prob[bsize], ACCT_STR);
+#endif
if (xd->counts)
xd->counts->wedge_interintra[bsize][mbmi->use_wedge_interintra]++;
if (mbmi->use_wedge_interintra) {
diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index bdaaac9..bf60ae9 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -2226,7 +2226,11 @@
cpi->common.allow_interintra_compound && is_interintra_allowed(mbmi)) {
const int interintra = mbmi->ref_frame[1] == INTRA_FRAME;
const int bsize_group = size_group_lookup[bsize];
+#if CONFIG_NEW_MULTISYMBOL
+ aom_write_symbol(w, interintra, ec_ctx->interintra_cdf[bsize_group], 2);
+#else
aom_write(w, interintra, cm->fc->interintra_prob[bsize_group]);
+#endif
if (interintra) {
#if CONFIG_EC_ADAPT
aom_write_symbol(w, mbmi->interintra_mode,
@@ -2238,8 +2242,13 @@
&interintra_mode_encodings[mbmi->interintra_mode]);
#endif
if (is_interintra_wedge_used(bsize)) {
+#if CONFIG_NEW_MULTISYMBOL
+ aom_write_symbol(w, mbmi->use_wedge_interintra,
+ ec_ctx->wedge_interintra_cdf[bsize], 2);
+#else
aom_write(w, mbmi->use_wedge_interintra,
cm->fc->wedge_interintra_prob[bsize]);
+#endif
if (mbmi->use_wedge_interintra) {
aom_write_literal(w, mbmi->interintra_wedge_index,
get_wedge_bits_lookup(bsize));
@@ -5112,12 +5121,14 @@
#if CONFIG_INTERINTRA
if (cm->reference_mode != COMPOUND_REFERENCE &&
cm->allow_interintra_compound) {
+#if !CONFIG_NEW_MULTISYMBOL
for (i = 0; i < BLOCK_SIZE_GROUPS; i++) {
if (is_interintra_allowed_bsize_group(i)) {
av1_cond_prob_diff_update(header_bc, &fc->interintra_prob[i],
cm->counts.interintra[i], probwt);
}
}
+#endif
#if !CONFIG_EC_ADAPT
for (i = 0; i < BLOCK_SIZE_GROUPS; i++) {
prob_diff_update(
@@ -5125,13 +5136,13 @@
counts->interintra_mode[i], INTERINTRA_MODES, probwt, header_bc);
}
#endif
-#if CONFIG_WEDGE
+#if CONFIG_WEDGE && !CONFIG_NEW_MULTISYMBOL
for (i = 0; i < BLOCK_SIZES; i++) {
if (is_interintra_allowed_bsize(i) && is_interintra_wedge_used(i))
av1_cond_prob_diff_update(header_bc, &fc->wedge_interintra_prob[i],
cm->counts.wedge_interintra[i], probwt);
}
-#endif // CONFIG_WEDGE
+#endif // CONFIG_WEDGE && CONFIG_NEW_MULTISYMBOL
}
#endif // CONFIG_INTERINTRA
#if !CONFIG_EC_ADAPT && (CONFIG_COMPOUND_SEGMENT || CONFIG_WEDGE)
