commit 6f3c898f5dd60d0560f5f298320a7ef5a1245554
author Debargha Mukherjee <debargha@google.com> Fri Sep 22 21:14:01 2017 -0700
committer Debargha Mukherjee <debargha@google.com> Sat Sep 23 15:46:06 2017 +0000
tree 8300ab7b13720e8d2eec86a847de18de8262b647
parent 801cc926d955f7d124454b0df47c39e3a10845b5

Setup ref mode after reading uncompressed header

Removes setup in compressed header so that the compressed
header can be skipped.

Change-Id: I8d7ed63944a4f75704222f4ad7d0159db1cec0d1

av1/decoder/decodeframe.c

diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
index 10c3582..8b74350 100644
--- a/av1/decoder/decodeframe.c
+++ b/av1/decoder/decodeframe.c
@@ -5057,6 +5057,7 @@
 #endif  // CONFIG_LOOP_RESTORATION
   cm->tx_mode = read_tx_mode(cm, rb);
   cm->reference_mode = read_frame_reference_mode(cm, rb);
+  if (cm->reference_mode != SINGLE_REFERENCE) setup_compound_reference_mode(cm);
 #if CONFIG_EXT_INTER
   read_compound_tools(cm, rb);
 #endif  // CONFIG_EXT_INTER
@@ -5167,8 +5168,6 @@
       av1_diff_update_prob(&r, &fc->intra_inter_prob[i], ACCT_STR);
 #endif
 
-    if (cm->reference_mode != SINGLE_REFERENCE)
-      setup_compound_reference_mode(cm);
 #if !CONFIG_NEW_MULTISYMBOL
     read_frame_reference_mode_probs(cm, &r);
 #endif