diff options
| author | John Koleszar <jkoleszar@google.com> | 2013-01-08 10:11:26 -0800 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2013-01-08 10:19:59 -0800 |
| commit | 879cb7d96259a71eea0038452a00241650589084 (patch) | |
| tree | 4d8c0a86fcdb6655d10647837e6c3adfb38639c4 /test/test.mk | |
| parent | c14439c3d3db8dfa44a30c4edc50f56250ce4cd3 (diff) | |
| parent | bdca030cafc31446afc1685906f7c44e1850ed84 (diff) | |
| download | libvpx-879cb7d96259a71eea0038452a00241650589084.tar libvpx-879cb7d96259a71eea0038452a00241650589084.tar.gz libvpx-879cb7d96259a71eea0038452a00241650589084.tar.bz2 libvpx-879cb7d96259a71eea0038452a00241650589084.zip | |
Merge vp9-preview changes into experimental branch
Incorportate vp9-preview changes by merging master branch into experimental.
Conflicts:
test/test.mk
vp9/common/vp9_filter.c
vp9/common/vp9_idctllm.c
vp9/common/vp9_invtrans.h
vp9/common/vp9_mbpitch.c
vp9/common/vp9_rtcd_defs.sh
vp9/common/vp9_systemdependent.h
vp9/common/vp9_type_aliases.h
vp9/common/x86/vp9_asm_stubs.c
vp9/common/x86/vp9_subpixel_mmx.asm
vp9/decoder/vp9_decodframe.c
vp9/decoder/vp9_dequantize.c
vp9/decoder/vp9_dequantize.h
vp9/decoder/vp9_onyxd_int.h
vp9/encoder/vp9_bitstream.c
vp9/encoder/vp9_encodeframe.c
vp9/encoder/vp9_rdopt.c
Change-Id: I17f51c3666d1b59cf1a699f87607cbc5d30a87c5
Diffstat (limited to 'test/test.mk')
| -rw-r--r-- | test/test.mk | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/test/test.mk b/test/test.mk index 919cf0438..28d387264 100644 --- a/test/test.mk +++ b/test/test.mk @@ -1,3 +1,4 @@ +LIBVPX_TEST_SRCS-yes += register_state_check.h LIBVPX_TEST_SRCS-yes += test.mk LIBVPX_TEST_SRCS-yes += acm_random.h @@ -59,16 +60,18 @@ ifneq ($(CONFIG_VP9_ENCODER)$(CONFIG_VP9_DECODER),) # These tests require both the encoder and decoder to be built. ifeq ($(CONFIG_VP9_ENCODER)$(CONFIG_VP9_DECODER),yesyes) LIBVPX_TEST_SRCS-yes += vp9_boolcoder_test.cc + +# IDCT test currently depends on FDCT function +LIBVPX_TEST_SRCS-yes += idct8x8_test.cc endif 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) += variance_test.cc ifeq ($(CONFIG_VP9_ENCODER)$(CONFIG_TX32X32),yesyes) LIBVPX_TEST_SRCS-yes += dct32x32_test.cc endif -LIBVPX_TEST_SRCS-yes += idct8x8_test.cc -LIBVPX_TEST_SRCS-yes += variance_test.cc endif # VP9 |