From bc2e01c9d357daf1eda7434538e3d02f241ec528 Mon Sep 17 00:00:00 2001 From: Thomas Davies Date: Mon, 10 Jul 2017 08:58:47 +0100 Subject: [PATCH] Clarify comments on kf_y_cdf to explain usage. BUG=aomedia:630 Change-Id: Idf39c702dfee4fe35f2b0e768cf60f27ed7db08b --- av1/common/entropy.c | 2 ++ av1/common/entropymode.h | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/av1/common/entropy.c b/av1/common/entropy.c index 2f0309dc9..98732a8d8 100644 --- a/av1/common/entropy.c +++ b/av1/common/entropy.c @@ -5725,6 +5725,8 @@ void av1_average_tile_inter_cdfs(AV1_COMMON *cm, FRAME_CONTEXT *fc, #endif #endif // CONFIG_EXT_INTER + /* NB: kf_y_cdf is discarded after use, so no need + for backwards update */ AVERAGE_TILE_CDFS(y_mode_cdf) if (cm->interp_filter == SWITCHABLE) { diff --git a/av1/common/entropymode.h b/av1/common/entropymode.h index ab8596e08..0f3b65a82 100644 --- a/av1/common/entropymode.h +++ b/av1/common/entropymode.h @@ -310,8 +310,10 @@ typedef struct frame_contexts { #endif aom_cdf_prob switchable_interp_cdf[SWITCHABLE_FILTER_CONTEXTS] [CDF_SIZE(SWITCHABLE_FILTERS)]; - /* Keep track of kf_y_cdf here, as this makes handling - multiple copies for adaptation in tiles easier */ + /* kf_y_cdf is discarded after use, so does not require persistent storage. + However, we keep it with the other CDFs in this struct since it needs to + be copied to each tile to support parallelism just like the others. + */ aom_cdf_prob kf_y_cdf[INTRA_MODES][INTRA_MODES][CDF_SIZE(INTRA_MODES)]; aom_cdf_prob tx_size_cdf[MAX_TX_DEPTH][TX_SIZE_CONTEXTS] [CDF_SIZE(MAX_TX_DEPTH + 1)]; -- GitLab