Commit 11876faa authored by Scott LaVarnway's avatar Scott LaVarnway

Removed mcomp_filter_type

and replaced with use_bilinear_mc_filter.

Change-Id: Ie9e9f0bccca4ab7d3e23ae045aefed33536103ff
parent 88e4a8af
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment