diff options
| author | Deb Mukherjee <debargha@google.com> | 2012-10-22 14:43:01 -0700 |
|---|---|---|
| committer | Deb Mukherjee <debargha@google.com> | 2012-10-23 08:50:52 -0700 |
| commit | 537311971348b1919de8b36266f900aa4657672f (patch) | |
| tree | 0e6cf0972d087cb01b21fc4aeea42c5186ba7edf /vp8/encoder/block.h | |
| parent | f93d316e0c7121aca5857f3d6e1530dcd82e9d7f (diff) | |
| download | libvpx-537311971348b1919de8b36266f900aa4657672f.tar libvpx-537311971348b1919de8b36266f900aa4657672f.tar.gz libvpx-537311971348b1919de8b36266f900aa4657672f.tar.bz2 libvpx-537311971348b1919de8b36266f900aa4657672f.zip | |
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
Diffstat (limited to 'vp8/encoder/block.h')
| -rw-r--r-- | vp8/encoder/block.h | 7 |
1 files changed, 3 insertions, 4 deletions
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; |