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/common/pred_common.c | |
| 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/common/pred_common.c')
| -rw-r--r-- | vp8/common/pred_common.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/vp8/common/pred_common.c b/vp8/common/pred_common.c index a32389433..a97eed8e4 100644 --- a/vp8/common/pred_common.c +++ b/vp8/common/pred_common.c @@ -63,7 +63,6 @@ unsigned char get_pred_context(const VP8_COMMON *const cm, (m - cm->mode_info_stride)->mbmi.mb_skip_coeff; break; -#if CONFIG_SWITCHABLE_INTERP case PRED_SWITCHABLE_INTERP: { int left_in_image = (m - 1)->mbmi.mb_in_image; @@ -93,7 +92,6 @@ unsigned char get_pred_context(const VP8_COMMON *const cm, pred_context = VP8_SWITCHABLE_FILTERS; } break; -#endif default: // TODO *** add error trap code. @@ -175,11 +173,10 @@ const vp8_prob *get_pred_probs(const VP8_COMMON *const cm, pred_probability = &cm->mbskip_pred_probs[pred_context]; break; -#if CONFIG_SWITCHABLE_INTERP case PRED_SWITCHABLE_INTERP: pred_probability = &cm->fc.switchable_interp_prob[pred_context][0]; break; -#endif + default: // TODO *** add error trap code. pred_probability = NULL; |