commit 05570bb8c31d2432f5448f7547b8dca660fdfeb1
author Sarah Parker <sarahparker@google.com> Mon Nov 04 18:51:32 2019 -0800
committer Sarah Parker <sarahparker@google.com> Mon Nov 11 21:36:15 2019 +0000
tree 018cbae34d5de7a670eff28f0c11a2965eb1cfd1
parent 047b7c94209a460bd9ed05f2c8bf525aa92d5023

Fix crashes with fwd-kf and keyframe filtering

Change-Id: Iae8d319bc62a3fa7595d598dcde68aff3c33039c

av1/encoder/encode_strategy.c

diff --git a/av1/encoder/encode_strategy.c b/av1/encoder/encode_strategy.c
index e3c869a..de3c565 100644
--- a/av1/encoder/encode_strategy.c
+++ b/av1/encoder/encode_strategy.c
@@ -931,6 +931,7 @@
   }
   const int apply_filtering =
       oxcf->pass == 2 && frame_params->frame_type == KEY_FRAME &&
+      frame_params->show_frame &&
       cpi->rc.frames_to_key > NUM_KEY_FRAME_DENOISING && noise_level > 0 &&
       !is_lossless_requested(oxcf) && oxcf->arnr_max_frames > 0;
   // Save the pointer to the original source image.

av1/encoder/temporal_filter.c

diff --git a/av1/encoder/temporal_filter.c b/av1/encoder/temporal_filter.c
index 2307996..556bb5a 100644
--- a/av1/encoder/temporal_filter.c
+++ b/av1/encoder/temporal_filter.c
@@ -1573,12 +1573,11 @@
                        &sigma, &frames_to_blur_backward,
                        &frames_to_blur_forward);
     start_frame = distance + frames_to_blur_forward;
+    cpi->common.showable_frame =
+        (strength == 0 && frames_to_blur == 1) ||
+        (cpi->oxcf.enable_overlay == 0 || cpi->sf.disable_overlay_frames);
   }
 
-  cpi->common.showable_frame =
-      (strength == 0 && frames_to_blur == 1) ||
-      (cpi->oxcf.enable_overlay == 0 || cpi->sf.disable_overlay_frames);
-
   // Setup frame pointers, NULL indicates frame not included in filter.
   for (frame = 0; frame < frames_to_blur; ++frame) {
     const int which_buffer = start_frame - frame;