From 92b90f30226a4103dbd6e2f858281ae0a7364c76 Mon Sep 17 00:00:00 2001
From: Urvang Joshi <urvang@google.com>
Date: Tue, 7 Feb 2017 17:06:31 -0800
Subject: [PATCH] Add comments about some default probability tables.
Change-Id: I070ee1acde80c99576d30f2611b6c653834b3e9b
---
av1/common/entropymode.c | 6 ++++++
av1/common/entropymode.h | 4 ++++
2 files changed, 10 insertions(+)
diff --git a/av1/common/entropymode.c b/av1/common/entropymode.c
index 4db2ba97ed..57ba8c87e6 100644
--- a/av1/common/entropymode.c
+++ b/av1/common/entropymode.c
@@ -335,6 +335,9 @@ const aom_prob av1_kf_y_mode_prob[INTRA_MODES][INTRA_MODES][INTRA_MODES - 1] = {
}
};
+// Default probabilities for signaling Intra mode for Y plane -- used only for
+// inter frames. ('av1_kf_y_mode_prob' is used for intra-only frames).
+// Context used: block size group.
static const aom_prob default_if_y_probs[BLOCK_SIZE_GROUPS][INTRA_MODES - 1] = {
{ 65, 32, 18, 144, 162, 194, 41, 51, 98 }, // block_size < 8x8
{ 132, 68, 18, 165, 217, 196, 45, 40, 78 }, // block_size < 16x16
@@ -342,6 +345,9 @@ static const aom_prob default_if_y_probs[BLOCK_SIZE_GROUPS][INTRA_MODES - 1] = {
{ 221, 135, 38, 194, 248, 121, 96, 85, 29 } // block_size >= 32x32
};
+// Default probabilities for signaling Intra mode for UV plane -- common for
+// both intra and inter frames.
+// Context used: Intra mode used by Y plane of the same block.
static const aom_prob default_uv_probs[INTRA_MODES][INTRA_MODES - 1] = {
{ 120, 7, 76, 176, 208, 126, 28, 54, 103 }, // y = dc
{ 48, 12, 154, 155, 139, 90, 34, 117, 119 }, // y = v
diff --git a/av1/common/entropymode.h b/av1/common/entropymode.h
index b3801fe8c0..af1b8ccf39 100644
--- a/av1/common/entropymode.h
+++ b/av1/common/entropymode.h
@@ -365,9 +365,13 @@ typedef struct FRAME_COUNTS {
#endif // CONFIG_FILTER_INTRA
} FRAME_COUNTS;
+// Default probabilities for signaling Intra mode for Y plane -- used only for
+// intra-only frames. ('default_if_y_probs' is used for inter frames).
+// Contexts used: Intra mode (Y plane) of 'above' and 'left' blocks.
extern const aom_prob av1_kf_y_mode_prob[INTRA_MODES][INTRA_MODES]
[INTRA_MODES - 1];
#if CONFIG_EC_MULTISYMBOL
+// CDF version of 'av1_kf_y_mode_prob'.
extern aom_cdf_prob av1_kf_y_mode_cdf[INTRA_MODES][INTRA_MODES][INTRA_MODES];
#endif
#if CONFIG_PALETTE
--
GitLab