commit 171f4b375e39ce01ba5897d8a62db842aadfec21
author Debargha Mukherjee <debargha@google.com> Thu Jun 21 10:06:41 2018 -0700
committer Debargha Mukherjee <debargha@google.com> Fri Jun 22 02:40:47 2018 +0000
tree d53683eafcbca0f1fb79f3e984b733c57210d312
parent f4669c21de5aadd37e378ad93cfd83e9d20a345d

[NORMATIVE] Rem rest. for show_exisitng_frames

Remove restriction allowing multiple show_existing_frames.

BUG=aomedia:1978

Change-Id: I5e5704a9e6eb1136ee5e175e6f791f41a7e36f35

av1/decoder/decodeframe.c

diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
index 3b0e061..e92c6b2 100644
--- a/av1/decoder/decodeframe.c
+++ b/av1/decoder/decodeframe.c
@@ -3704,7 +3704,8 @@
       if (!frame_bufs[frame_to_show].showable_frame) {
         aom_merge_corrupted_flag(&xd->corrupted, 1);
       }
-      frame_bufs[frame_to_show].showable_frame = 0;
+      if (cm->reset_decoder_state) frame_bufs[frame_to_show].showable_frame = 0;
+
       cm->film_grain_params = frame_bufs[frame_to_show].film_grain_params;
 
       if (cm->reset_decoder_state) {
@@ -3723,7 +3724,7 @@
       aom_internal_error(&cm->error, AOM_CODEC_CORRUPT_FRAME,
                          "Still pictures must be coded as shown keyframes");
     }
-    cm->showable_frame = 0;
+    cm->showable_frame = cm->frame_type != KEY_FRAME;
     if (cm->show_frame) {
       if (cm->seq_params.decoder_model_info_present_flag &&
           cm->timing_info.equal_picture_interval == 0)