summaryrefslogtreecommitdiff
path: root/vpx_scale/arm
diff options
context:
space:
mode:
authorDeb Mukherjee <debargha@google.com>2012-07-27 17:46:33 -0700
committerDeb Mukherjee <debargha@google.com>2012-07-31 11:45:31 -0700
commit0ebf548c752ef25ff8e9a65037fd9aee6420184e (patch)
tree4bd5d3fe6f510857d66bff21bfe9c7a0046a3f66 /vpx_scale/arm
parent5259744145fe4ff41d3c814514c0744444969ad3 (diff)
downloadlibvpx-0ebf548c752ef25ff8e9a65037fd9aee6420184e.tar
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/arm')
-rw-r--r--vpx_scale/arm/scalesystemdependent.c2
1 files changed, 2 insertions, 0 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
}