commit b44deca918c7d8207dca622f3a54645ef26e40d3
author David Barker <david.barker@argondesign.com> Fri Nov 03 17:06:10 2017 +0000
committer Debargha Mukherjee <debargha@google.com> Fri Nov 03 22:04:25 2017 +0000
tree 7df90a1d18c2107680f40537769d0cbea8914c3c
parent ff090b86859cc4522e360c7424950f9a05385db3

Fix bug introduced by commit 0156308

When fixing one bug in av1_decode_tg_tiles_and_wrapup, I seem to have
introduced another bug. This was due to checking the wrong condition
on whether to update the frame context at the end of the frame.

BUG=aomedia:1001

Change-Id: I929a710e2de31a89cc7899fb1605ca7edf968a87

av1/decoder/decodeframe.c

diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
index fc951bb..44ab9a3 100644
--- a/av1/decoder/decodeframe.c
+++ b/av1/decoder/decodeframe.c
@@ -3887,7 +3887,8 @@
 #endif
 
   // Non frame parallel update frame context here.
-  if (cm->refresh_frame_context != REFRESH_FRAME_CONTEXT_FORWARD) {
+  if (!cm->frame_parallel_decode ||
+      cm->refresh_frame_context != REFRESH_FRAME_CONTEXT_FORWARD) {
 #if CONFIG_NO_FRAME_CONTEXT_SIGNALING
     cm->frame_contexts[cm->new_fb_idx] = *cm->fc;
 #else