diff options
| author | Deb Mukherjee <debargha@google.com> | 2012-07-27 17:46:33 -0700 |
|---|---|---|
| committer | Deb Mukherjee <debargha@google.com> | 2012-07-31 11:45:31 -0700 |
| commit | 0ebf548c752ef25ff8e9a65037fd9aee6420184e (patch) | |
| tree | 4bd5d3fe6f510857d66bff21bfe9c7a0046a3f66 /vpx_scale | |
| parent | 5259744145fe4ff41d3c814514c0744444969ad3 (diff) | |
| download | libvpx-0ebf548c752ef25ff8e9a65037fd9aee6420184e.tar.gz libvpx-0ebf548c752ef25ff8e9a65037fd9aee6420184e.tar.bz2 libvpx-0ebf548c752ef25ff8e9a65037fd9aee6420184e.zip | |
Merging and bug-fix in enhanced_interp experiment
Merged the enhanced_interp experiment.
Found and fixed a bug in the include files framework, whereby
certain encoder files were still using the old INTERP_EXTEND
value of 3 instead of 4. The thresholds for mv range mcomp.c
need a small adjustment to prevent crashes.
The results are more or less unchanged.
Change-Id: Iac5008390f1efc97ce1102fbb5f8989c847fb579
Diffstat (limited to 'vpx_scale')
| -rw-r--r-- | vpx_scale/arm/scalesystemdependent.c | 2 | ||||
| -rw-r--r-- | vpx_scale/yv12config.h | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/vpx_scale/arm/scalesystemdependent.c b/vpx_scale/arm/scalesystemdependent.c index 5c19d61d9..d168d0510 100644 --- a/vpx_scale/arm/scalesystemdependent.c +++ b/vpx_scale/arm/scalesystemdependent.c @@ -87,9 +87,11 @@ void vp8_scale_machine_specific_config() { if (flags & HAS_NEON) #endif { +#if VP8BORDERINPIXELS == 32 vp8_yv12_extend_frame_borders_ptr = vp8_yv12_extend_frame_borders_neon; vp8_yv12_copy_frame_yonly_ptr = vp8_yv12_copy_frame_yonly_neon; vp8_yv12_copy_frame_ptr = vp8_yv12_copy_frame_neon; +#endif } #endif } diff --git a/vpx_scale/yv12config.h b/vpx_scale/yv12config.h index 1c18b098a..83523e253 100644 --- a/vpx_scale/yv12config.h +++ b/vpx_scale/yv12config.h @@ -11,6 +11,9 @@ #ifndef YV12_CONFIG_H #define YV12_CONFIG_H + +#include "vpx_config.h" + #ifdef __cplusplus extern "C" { @@ -18,13 +21,8 @@ extern "C" #define VP7BORDERINPIXELS 48 -#if CONFIG_ENHANCED_INTERP #define VP8BORDERINPIXELS 64 #define INTERP_EXTEND 4 -#else -#define VP8BORDERINPIXELS 32 -#define INTERP_EXTEND 3 -#endif /************************************* For INT_YUV: |