From 537311971348b1919de8b36266f900aa4657672f Mon Sep 17 00:00:00 2001 From: Deb Mukherjee Date: Mon, 22 Oct 2012 14:43:01 -0700 Subject: Merging in the Switchable interp experiment There is a macro DEFAULT_INTERP_FILTER defined in encoder/onyx_if.c that is set as EIGHTTAP for now - so SWITCHABLE is not really used. Ideally, this should be SWITCHABLE but that would make the encoder quite a bit slower. We will change the default filter to SWITCHABLE once we find a faster way to search for switchable filters. Change-Id: Iee91832cdc07e6e14108d9b543130fdd12fc9874 --- vp8/encoder/block.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'vp8/encoder/block.h') diff --git a/vp8/encoder/block.h b/vp8/encoder/block.h index c18b64f2c..48623be8c 100644 --- a/vp8/encoder/block.h +++ b/vp8/encoder/block.h @@ -129,12 +129,11 @@ typedef struct { int bmode_costs[VP8_BINTRAMODES][VP8_BINTRAMODES][VP8_BINTRAMODES]; int i8x8_mode_costs[MB_MODE_COUNT]; int inter_bmode_costs[B_MODE_COUNT]; -#if CONFIG_SWITCHABLE_INTERP - int switchable_interp_costs[VP8_SWITCHABLE_FILTERS+1] + int switchable_interp_costs[VP8_SWITCHABLE_FILTERS + 1] [VP8_SWITCHABLE_FILTERS]; -#endif - // These define limits to motion vector components to prevent them from extending outside the UMV borders + // These define limits to motion vector components to prevent them + // from extending outside the UMV borders int mv_col_min; int mv_col_max; int mv_row_min; -- cgit v1.2.3