commit 10e1da9aaa4fe3a88dbd8bc1f606955e19a54d14
author Thomas Daede <tdaede@mozilla.com> Wed Apr 26 13:22:21 2017 -0700
committer Thomas Daede <tdaede@mozilla.com> Thu May 04 16:31:32 2017 +0000
tree 7043068c842606ebc4bdd0ed8abbf40876efcb49
parent 9fa0248786a8d731c15d631db8b6744c58ae96e9

Store pre_fc in AV1_COMMON rather than computing it on the spot.

Prep work for changing how frame contexts are signaled.

Change-Id: I0db8ec631fc2d616d16fabaf72eac5663ffe3630

av1/common/entropymode.c

diff --git a/av1/common/entropymode.c b/av1/common/entropymode.c
index 0fcf762..ac1a418 100644
--- a/av1/common/entropymode.c
+++ b/av1/common/entropymode.c
@@ -3455,7 +3455,7 @@
 void av1_adapt_inter_frame_probs(AV1_COMMON *cm) {
   int i, j;
   FRAME_CONTEXT *fc = cm->fc;
-  const FRAME_CONTEXT *pre_fc = &cm->frame_contexts[cm->frame_context_idx];
+  const FRAME_CONTEXT *pre_fc = cm->pre_fc;
   const FRAME_COUNTS *counts = &cm->counts;
 
   for (i = 0; i < INTRA_INTER_CONTEXTS; i++)
@@ -3586,7 +3586,7 @@
 void av1_adapt_intra_frame_probs(AV1_COMMON *cm) {
   int i, j;
   FRAME_CONTEXT *fc = cm->fc;
-  const FRAME_CONTEXT *pre_fc = &cm->frame_contexts[cm->frame_context_idx];
+  const FRAME_CONTEXT *pre_fc = cm->pre_fc;
   const FRAME_COUNTS *counts = &cm->counts;
 
   if (cm->tx_mode == TX_MODE_SELECT) {