summaryrefslogtreecommitdiff
path: root/vp8/common/generic
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 /vp8/common/generic
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 'vp8/common/generic')
-rw-r--r--vp8/common/generic/systemdependent.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/vp8/common/generic/systemdependent.c b/vp8/common/generic/systemdependent.c
index df162234c..441426320 100644
--- a/vp8/common/generic/systemdependent.c
+++ b/vp8/common/generic/systemdependent.c
@@ -78,7 +78,6 @@ void vp8_machine_specific_config(VP8_COMMON *ctx) {
vp8_comp_intra_uv4x4_predict;
#endif
-#if CONFIG_ENHANCED_INTERP
rtcd->subpix.eighttap16x16 = vp8_eighttap_predict16x16_c;
rtcd->subpix.eighttap8x8 = vp8_eighttap_predict8x8_c;
rtcd->subpix.eighttap_avg16x16 = vp8_eighttap_predict_avg16x16_c;
@@ -93,7 +92,7 @@ void vp8_machine_specific_config(VP8_COMMON *ctx) {
rtcd->subpix.eighttap_avg4x4_sharp = vp8_eighttap_predict_avg4x4_sharp_c;
rtcd->subpix.eighttap8x4_sharp = vp8_eighttap_predict8x4_sharp_c;
rtcd->subpix.eighttap4x4_sharp = vp8_eighttap_predict_sharp_c;
-#endif
+
rtcd->subpix.sixtap16x16 = vp8_sixtap_predict16x16_c;
rtcd->subpix.sixtap8x8 = vp8_sixtap_predict8x8_c;
rtcd->subpix.sixtap_avg16x16 = vp8_sixtap_predict_avg16x16_c;