From 11876faa1171368d8921e3969151e08494a11858 Mon Sep 17 00:00:00 2001
From: Scott LaVarnway <slavarnway@google.com>
Date: Mon, 23 Apr 2012 13:23:21 -0400
Subject: [PATCH] Removed mcomp_filter_type

and replaced with use_bilinear_mc_filter.

Change-Id: Ie9e9f0bccca4ab7d3e23ae045aefed33536103ff
---
 vp8/common/onyxc_int.h    | 7 -------
 vp8/decoder/decodframe.c  | 7 +------
 vp8/encoder/encodeframe.c | 2 +-
 vp8/encoder/onyx_if.c     | 5 -----
 4 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/vp8/common/onyxc_int.h b/vp8/common/onyxc_int.h
index 2387b9d09..0e4c9be2f 100644
--- a/vp8/common/onyxc_int.h
+++ b/vp8/common/onyxc_int.h
@@ -59,12 +59,6 @@ typedef enum
     RECON_CLAMP_NOTREQUIRED     = 1
 } CLAMP_TYPE;
 
-typedef enum
-{
-    SIXTAP   = 0,
-    BILINEAR = 1
-} INTERPOLATIONFILTERTYPE;
-
 typedef struct VP8Common
 
 {
@@ -134,7 +128,6 @@ typedef struct VP8Common
     MODE_INFO *prev_mi;  /* 'mi' from last frame (points into prev_mip) */
 
 
-    INTERPOLATIONFILTERTYPE mcomp_filter_type;
     LOOPFILTERTYPE filter_type;
 
     loop_filter_info_n lf_info;
diff --git a/vp8/decoder/decodframe.c b/vp8/decoder/decodframe.c
index b9cea7e76..3332f6702 100644
--- a/vp8/decoder/decodframe.c
+++ b/vp8/decoder/decodframe.c
@@ -684,13 +684,8 @@ static void init_frame(VP8D_COMP *pbi)
     }
     else
     {
-        if (!pc->use_bilinear_mc_filter)
-            pc->mcomp_filter_type = SIXTAP;
-        else
-            pc->mcomp_filter_type = BILINEAR;
-
         /* To enable choice of different interploation filters */
-        if (pc->mcomp_filter_type == SIXTAP)
+        if (!pc->use_bilinear_mc_filter)
         {
             xd->subpixel_predict        = vp8_sixtap_predict4x4;
             xd->subpixel_predict8x4     = vp8_sixtap_predict8x4;
diff --git a/vp8/encoder/encodeframe.c b/vp8/encoder/encodeframe.c
index 962a719c8..1f4019772 100644
--- a/vp8/encoder/encodeframe.c
+++ b/vp8/encoder/encodeframe.c
@@ -695,7 +695,7 @@ void vp8_encode_frame(VP8_COMP *cpi)
     }
 
     // Functions setup for all frame types so we can use MC in AltRef
-    if (cm->mcomp_filter_type == SIXTAP)
+    if(!cm->use_bilinear_mc_filter)
     {
         xd->subpixel_predict        = vp8_sixtap_predict4x4;
         xd->subpixel_predict8x4     = vp8_sixtap_predict8x4;
diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c
index 69b88a8da..06887f8eb 100644
--- a/vp8/encoder/onyx_if.c
+++ b/vp8/encoder/onyx_if.c
@@ -1595,11 +1595,6 @@ void vp8_change_config(VP8_COMP *cpi, VP8_CONFIG *oxcf)
     // Only allow dropped frames in buffered mode
     cpi->drop_frames_allowed = cpi->oxcf.allow_df && cpi->buffered_mode;
 
-    if (!cm->use_bilinear_mc_filter)
-        cm->mcomp_filter_type = SIXTAP;
-    else
-        cm->mcomp_filter_type = BILINEAR;
-
     cpi->target_bandwidth = cpi->oxcf.target_bandwidth;