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/ratectrl.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/encoder/ratectrl.c')
| -rw-r--r-- | vp8/encoder/ratectrl.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/vp8/encoder/ratectrl.c b/vp8/encoder/ratectrl.c index 85036e4c0..cc3c82e74 100644 --- a/vp8/encoder/ratectrl.c +++ b/vp8/encoder/ratectrl.c @@ -176,9 +176,7 @@ void vp8_save_coding_context(VP8_COMP *cpi) { vp8_copy(cc->hybrid_coef_probs_8x8, cm->fc.hybrid_coef_probs_8x8); vp8_copy(cc->coef_probs_16x16, cm->fc.coef_probs_16x16); vp8_copy(cc->hybrid_coef_probs_16x16, cm->fc.hybrid_coef_probs_16x16); -#if CONFIG_SWITCHABLE_INTERP vp8_copy(cc->switchable_interp_prob, cm->fc.switchable_interp_prob); -#endif } void vp8_restore_coding_context(VP8_COMP *cpi) { @@ -234,9 +232,7 @@ void vp8_restore_coding_context(VP8_COMP *cpi) { vp8_copy(cm->fc.hybrid_coef_probs_8x8, cc->hybrid_coef_probs_8x8); vp8_copy(cm->fc.coef_probs_16x16, cc->coef_probs_16x16); vp8_copy(cm->fc.hybrid_coef_probs_16x16, cc->hybrid_coef_probs_16x16); -#if CONFIG_SWITCHABLE_INTERP vp8_copy(cm->fc.switchable_interp_prob, cc->switchable_interp_prob); -#endif } |