commit a816bceaa3514190d06417ffbdd64f010de4b062
author Remya <remya.prakasan@ittiam.com> Fri Mar 13 12:07:15 2020 +0530
committer Yunqing Wang <yunqingwang@google.com> Wed Mar 18 00:27:58 2020 +0000
tree 9a6755c0b30f631896721448835ad96fd5065e08
parent ce4ee31a140b23ce0c35bf484804f320876249a7

Enable the sf prune_inter_modes_based_on_tpl

Fixed an assertion failure and enabled the speed feature
‘prune_inter_modes_based_on_tpl’ for cpu-used = 5.

BUG=aomedia:2602

STATS_CHANGED

Change-Id: Icf382b6efb94dd9ca1546fe2823c080eadfef7da

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index cbd3339..0b570d6 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -2302,7 +2302,7 @@
       continue;
     }
     if (prune_modes_based_on_tpl && !ref_match_found_in_above_nb &&
-        !ref_match_found_in_left_nb) {
+        !ref_match_found_in_left_nb && (ref_best_rd != INT64_MAX)) {
       if (prune_modes_based_on_tpl_stats(inter_cost_info_from_tpl, refs,
                                          ref_mv_idx, this_mode))
         continue;

av1/encoder/speed_features.c

diff --git a/av1/encoder/speed_features.c b/av1/encoder/speed_features.c
index 5117f52..11e2d61 100644
--- a/av1/encoder/speed_features.c
+++ b/av1/encoder/speed_features.c
@@ -575,6 +575,7 @@
     sf->part_sf.ext_partition_eval_thresh =
         cm->allow_screen_content_tools ? BLOCK_8X8 : BLOCK_16X16;
 
+    sf->inter_sf.prune_inter_modes_based_on_tpl = boosted ? 0 : 1;
     sf->inter_sf.disable_interinter_wedge = 1;
     sf->inter_sf.disable_obmc = 1;
     sf->inter_sf.disable_onesided_comp = 1;