commit 952bb70ee3694edb8044c5fb7f59d65922453b44
author Sachin Kumar Garg <sachin.kumargarg@ittiam.com> Tue Jun 18 20:15:07 2019 +0530
committer Yunqing Wang <yunqingwang@google.com> Wed Jun 19 17:48:23 2019 +0000
tree 0b5aeb292da71f2e48fa817391d1fb338fa79f7c
parent 2225853fe18ddb07cc7ba07893d68c61ea841810

Fix bug in adaptive_interp_filter speed feature

Usage of InterpFilter and InterpFilters have been corrected
appropriately.

Change-Id: I7a83fe3cfbe05686a1e3ab4066b4db835e7c4dc6

av1/encoder/encoder.c

diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c
index 9609c89..43b927d 100644
--- a/av1/encoder/encoder.c
+++ b/av1/encoder/encoder.c
@@ -4766,7 +4766,7 @@
 
 static int get_interp_filter_selected(const AV1_COMMON *const cm,
                                       MV_REFERENCE_FRAME ref,
-                                      InterpFilters ifilter) {
+                                      InterpFilter ifilter) {
   const RefCntBuffer *const buf = get_ref_frame_buf(cm, ref);
   if (buf == NULL) return 0;
   return buf->interp_filter_selected[ifilter];
@@ -4780,7 +4780,7 @@
     return 0;
 
   for (MV_REFERENCE_FRAME ref = LAST_FRAME; ref <= ALTREF_FRAME; ++ref) {
-    for (InterpFilters ifilter = EIGHTTAP_REGULAR; ifilter <= MULTITAP_SHARP;
+    for (InterpFilter ifilter = EIGHTTAP_REGULAR; ifilter <= MULTITAP_SHARP;
          ++ifilter) {
       ref_total[ref] += get_interp_filter_selected(cm, ref, ifilter);
     }
@@ -4790,7 +4790,7 @@
                          ref_total[ALTREF2_FRAME] + ref_total[ALTREF_FRAME]);
 
   int mask = 0;
-  for (InterpFilters ifilter = EIGHTTAP_REGULAR; ifilter <= MULTITAP_SHARP;
+  for (InterpFilter ifilter = EIGHTTAP_REGULAR; ifilter <= MULTITAP_SHARP;
        ++ifilter) {
     int last_score = get_interp_filter_selected(cm, LAST_FRAME, ifilter) * 30;
     if (ref_total[LAST_FRAME] && last_score <= ref_total[LAST_FRAME]) {