Extend LAST2 ref frame pruning to speed 3, 4, 5

Pruning of LAST2 reference frame, based on temporal
distance and first-pass stats, is extended to speed
3, 4, and 5.

           Instruction Count        BD-Rate Loss(%)
cpu-used    Reduction(%)     avg.psnr  ovr.psnr   ssim
    3           3.916         0.0694    0.0666   0.0518
    4           3.697         0.0505    0.0391   0.0070
    5           3.658         0.0287    0.0166  -0.0494

STATS_CHANGED

Change-Id: I77610713086ef8ee8c704f412fb2cb1e13c3f7c5
diff --git a/av1/encoder/speed_features.c b/av1/encoder/speed_features.c
index 1e60f51..fba6a04 100644
--- a/av1/encoder/speed_features.c
+++ b/av1/encoder/speed_features.c
@@ -549,7 +549,7 @@
     sf->inter_sf.perform_best_rd_based_gating_for_chroma = 1;
     sf->inter_sf.prune_inter_modes_based_on_tpl = boosted ? 0 : 1;
     sf->inter_sf.prune_comp_search_by_single_result = boosted ? 4 : 2;
-    sf->inter_sf.selective_ref_frame = 4;
+    sf->inter_sf.selective_ref_frame = 5;
     sf->inter_sf.skip_repeated_ref_mv = 1;
     sf->inter_sf.skip_repeated_full_newmv = 1;
     sf->inter_sf.reuse_compound_type_decision = 1;
@@ -683,7 +683,6 @@
   if (speed >= 6) {
     sf->inter_sf.prune_inter_modes_based_on_tpl = boosted ? 0 : 3;
     sf->inter_sf.prune_nearmv_using_neighbors = 1;
-    sf->inter_sf.selective_ref_frame = 5;
 
     sf->part_sf.prune_rectangular_split_based_on_qidx =
         boosted || allow_screen_content_tools ? 0 : 1;
diff --git a/test/fwd_kf_test.cc b/test/fwd_kf_test.cc
index 15bd6f1..8b0fb69 100644
--- a/test/fwd_kf_test.cc
+++ b/test/fwd_kf_test.cc
@@ -25,7 +25,7 @@
 } FwdKfTestParam;
 
 const FwdKfTestParam kTestParams[] = {
-  { 4, 31.9 },  { 6, 32.8 },  { 8, 32.6 },
+  { 4, 31.89 }, { 6, 32.8 },  { 8, 32.6 },
   { 12, 32.4 }, { 16, 32.3 }, { 18, 32.1 }
 };