Remove unused variable compound_mode_context
Removing compound_mode_context as its value is always
zero and never used.
Observed memory footprint reduction with no impact on
encoder performance.
stream cpu-used encoder
BasketballDrill_832x480 1 ~1.104%
parkrun_720p50 3 ~1.103%
Change-Id: I3a63624cf27e15eb3fab3903ca9b96aab0ec147d
diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index de43624..0f05ee8 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -1288,7 +1288,7 @@
}
const int16_t mode_ctx =
- is_comp_ref ? mbmi_ext->compound_mode_context[mbmi->ref_frame[0]]
+ is_comp_ref ? 0
: av1_mode_context_analyzer(mbmi_ext->mode_context,
mbmi->ref_frame);
diff --git a/av1/encoder/block.h b/av1/encoder/block.h
index fa0ab80..b87411f 100644
--- a/av1/encoder/block.h
+++ b/av1/encoder/block.h
@@ -81,7 +81,6 @@
int *dc_sign_ctx[MAX_MB_PLANE];
CANDIDATE_MV ref_mv_stack[MODE_CTX_REF_FRAMES][MAX_REF_MV_STACK_SIZE];
int_mv global_mvs[REF_FRAMES];
- int16_t compound_mode_context[MODE_CTX_REF_FRAMES];
int16_t mode_context[MODE_CTX_REF_FRAMES];
uint8_t ref_mv_count[MODE_CTX_REF_FRAMES];
} MB_MODE_INFO_EXT;
diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index a505320..dcd3465 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -11046,7 +11046,6 @@
for (ref_frame = LAST_FRAME; ref_frame <= ALTREF_FRAME; ++ref_frame) {
x->pred_mv_sad[ref_frame] = INT_MAX;
x->mbmi_ext->mode_context[ref_frame] = 0;
- x->mbmi_ext->compound_mode_context[ref_frame] = 0;
mbmi_ext->ref_mv_count[ref_frame] = UINT8_MAX;
if (cpi->ref_frame_flags & ref_frame_flag_list[ref_frame]) {
if (mbmi->partition != PARTITION_NONE &&
@@ -11184,7 +11183,6 @@
for (ref_frame = LAST_FRAME; ref_frame <= ALTREF_FRAME; ++ref_frame) {
x->pred_mv_sad[ref_frame] = INT_MAX;
x->mbmi_ext->mode_context[ref_frame] = 0;
- x->mbmi_ext->compound_mode_context[ref_frame] = 0;
mbmi_ext->ref_mv_count[ref_frame] = UINT8_MAX;
if (cpi->ref_frame_flags & ref_frame_flag_list[ref_frame]) {
if (mbmi->partition != PARTITION_NONE &&