Merge changes Ife0d8147,I7d469716,Ic9a5615f into experimental
authorJohn Koleszar <jkoleszar@google.com>
Fri, 8 Feb 2013 21:19:47 +0000 (13:19 -0800)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Fri, 8 Feb 2013 21:19:47 +0000 (13:19 -0800)
* changes:
  Restore SSSE3 subpixel filters in new convolve framework
  Convert subpixel filters to use convolve framework
  Add 8-tap generic convolver

1  2 
test/test.mk
vp9/common/vp9_blockd.h
vp9/common/vp9_findnearmv.c
vp9/common/vp9_rtcd_defs.sh
vp9/encoder/vp9_onyx_if.c
vp9/encoder/vp9_rdopt.c
vp9/vp9_common.mk

diff --cc test/test.mk
@@@ -67,12 -66,12 +67,13 @@@ LIBVPX_TEST_SRCS-yes                   
  
  # IDCT test currently depends on FDCT function
  LIBVPX_TEST_SRCS-yes                   += idct8x8_test.cc
 +LIBVPX_TEST_SRCS-yes                   += tile_independence_test.cc
  endif
  
+ LIBVPX_TEST_SRCS-$(CONFIG_VP9)         += convolve_test.cc
  LIBVPX_TEST_SRCS-$(CONFIG_VP9_ENCODER) += fdct4x4_test.cc
  LIBVPX_TEST_SRCS-$(CONFIG_VP9_ENCODER) += fdct8x8_test.cc
 -#LIBVPX_TEST_SRCS-$(CONFIG_VP9_ENCODER) += dct16x16_test.cc
 +LIBVPX_TEST_SRCS-$(CONFIG_VP9_ENCODER) += dct16x16_test.cc
  LIBVPX_TEST_SRCS-$(CONFIG_VP9_ENCODER) += variance_test.cc
  LIBVPX_TEST_SRCS-$(CONFIG_VP9_ENCODER) += dct32x32_test.cc
  
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge