commit 3ff903ae9496fdee9a8a0364009cdbac25f04efb
author Wan-Teh Chang <wtc@google.com> Tue Feb 09 17:54:33 2021 -0800
committer Wan-Teh Chang <wtc@google.com> Wed Feb 10 22:46:35 2021 +0000
tree 06ef65f699431985105077c6ba08ba0d4f12b0ec
parent 45b648496330ad71c8ee450511695ba4fda46d1a

Fix the condition for disable_smooth_intra

Change the condition for disable_smooth_intra from:
    !frame_is_intra_only(&cpi->common) || (cpi->rc.frames_to_key != 1)
to:
    !frame_is_intra_only(&cpi->common) || (cpi->rc.frames_to_key > 1)

This code was originally added in the following CL:
https://aomedia-review.googlesource.com/c/aom/+/79961

The commit message says:

  Added a speed feature for smooth intra modes, and disabled the modes
  at speed 3 for non-key frames or (cpi->rc.frames_to_key != 1). This
  ensures no quality loss for all key frame encoding.

Since all key frame encoding is enabled by setting kf_max_dist to 0,
which forces cpi->rc.frames_to_key to be always 0, the old condition
evaluates to true for all key frame encoding, contradicting "This
ensures no quality loss for all key frame encoding."

BUG=aomedia:2955

Change-Id: I8737cf7ed22b7482d84653cfbe4edd41fd7ce5d2

av1/encoder/speed_features.c

diff --git a/av1/encoder/speed_features.c b/av1/encoder/speed_features.c
index 66b5d58..9ada886 100644
--- a/av1/encoder/speed_features.c
+++ b/av1/encoder/speed_features.c
@@ -508,7 +508,7 @@
     sf->interp_sf.disable_dual_filter = 1;
 
     sf->intra_sf.disable_smooth_intra =
-        !frame_is_intra_only(&cpi->common) || (cpi->rc.frames_to_key != 1);
+        !frame_is_intra_only(&cpi->common) || (cpi->rc.frames_to_key > 1);
     sf->intra_sf.intra_pruning_with_hog = 2;
 
     sf->rd_sf.perform_coeff_opt = is_boosted_arf2_bwd_type ? 3 : 4;