diff options
| -rw-r--r-- | test/byte_alignment_test.cc | 4 | ||||
| -rw-r--r-- | test/dct16x16_test.cc | 2 | ||||
| -rw-r--r-- | test/dct32x32_test.cc | 4 | ||||
| -rw-r--r-- | test/external_frame_buffer_test.cc | 7 | ||||
| -rw-r--r-- | vpx_dsp/intrapred.c | 4 |
5 files changed, 13 insertions, 8 deletions
diff --git a/test/byte_alignment_test.cc b/test/byte_alignment_test.cc index aa4b78b9a..3a808b046 100644 --- a/test/byte_alignment_test.cc +++ b/test/byte_alignment_test.cc @@ -21,14 +21,14 @@ namespace { +#if CONFIG_WEBM_IO + const int kLegacyByteAlignment = 0; const int kLegacyYPlaneByteAlignment = 32; const int kNumPlanesToCheck = 3; const char kVP9TestFile[] = "vp90-2-02-size-lf-1920x1080.webm"; const char kVP9Md5File[] = "vp90-2-02-size-lf-1920x1080.webm.md5"; -#if CONFIG_WEBM_IO - struct ByteAlignmentTestParam { int byte_alignment; vpx_codec_err_t expected_value; diff --git a/test/dct16x16_test.cc b/test/dct16x16_test.cc index 332210daa..0449b527c 100644 --- a/test/dct16x16_test.cc +++ b/test/dct16x16_test.cc @@ -293,6 +293,7 @@ void iht16x16_12(const tran_low_t *in, uint8_t *out, int stride, int tx_type) { vp9_highbd_iht16x16_256_add_c(in, out, stride, tx_type, 12); } +#if HAVE_SSE2 void idct16x16_10_add_10_c(const tran_low_t *in, uint8_t *out, int stride) { vpx_highbd_idct16x16_10_add_c(in, out, stride, 10); } @@ -301,7 +302,6 @@ void idct16x16_10_add_12_c(const tran_low_t *in, uint8_t *out, int stride) { vpx_highbd_idct16x16_10_add_c(in, out, stride, 12); } -#if HAVE_SSE2 void idct16x16_256_add_10_sse2(const tran_low_t *in, uint8_t *out, int stride) { vpx_highbd_idct16x16_256_add_sse2(in, out, stride, 10); } diff --git a/test/dct32x32_test.cc b/test/dct32x32_test.cc index f7327b100..2dac10bc1 100644 --- a/test/dct32x32_test.cc +++ b/test/dct32x32_test.cc @@ -81,10 +81,6 @@ typedef std::tr1::tuple<FwdTxfmFunc, InvTxfmFunc, int, vpx_bit_depth_t> Trans32x32Param; #if CONFIG_VP9_HIGHBITDEPTH -void idct32x32_8(const tran_low_t *in, uint8_t *out, int stride) { - vpx_highbd_idct32x32_1024_add_c(in, out, stride, 8); -} - void idct32x32_10(const tran_low_t *in, uint8_t *out, int stride) { vpx_highbd_idct32x32_1024_add_c(in, out, stride, 10); } diff --git a/test/external_frame_buffer_test.cc b/test/external_frame_buffer_test.cc index d02dca2be..2570f44eb 100644 --- a/test/external_frame_buffer_test.cc +++ b/test/external_frame_buffer_test.cc @@ -24,7 +24,6 @@ namespace { const int kVideoNameParam = 1; -const char kVP9TestFile[] = "vp90-2-02-size-lf-1920x1080.webm"; struct ExternalFrameBuffer { uint8_t *data; @@ -155,6 +154,8 @@ class ExternalFrameBufferList { ExternalFrameBuffer *ext_fb_list_; }; +#if CONFIG_WEBM_IO + // Callback used by libvpx to request the application to return a frame // buffer of at least |min_size| in bytes. int get_vp9_frame_buffer(void *user_priv, size_t min_size, @@ -197,6 +198,8 @@ int do_not_release_vp9_frame_buffer(void *user_priv, return 0; } +#endif // CONFIG_WEBM_IO + // Class for testing passing in external frame buffers to libvpx. class ExternalFrameBufferMD5Test : public ::libvpx_test::DecoderTest, @@ -278,6 +281,8 @@ class ExternalFrameBufferMD5Test }; #if CONFIG_WEBM_IO +const char kVP9TestFile[] = "vp90-2-02-size-lf-1920x1080.webm"; + // Class for testing passing in external frame buffers to libvpx. class ExternalFrameBufferTest : public ::testing::Test { protected: diff --git a/vpx_dsp/intrapred.c b/vpx_dsp/intrapred.c index 912a2e0a6..ba35b23c6 100644 --- a/vpx_dsp/intrapred.c +++ b/vpx_dsp/intrapred.c @@ -534,6 +534,7 @@ static INLINE void highbd_d207_predictor(uint16_t *dst, ptrdiff_t stride, } } +#if CONFIG_MISC_FIXES static INLINE void highbd_d207e_predictor(uint16_t *dst, ptrdiff_t stride, int bs, const uint16_t *above, const uint16_t *left, int bd) { @@ -550,6 +551,7 @@ static INLINE void highbd_d207e_predictor(uint16_t *dst, ptrdiff_t stride, dst += stride; } } +#endif // CONFIG_MISC_FIXES static INLINE void highbd_d63_predictor(uint16_t *dst, ptrdiff_t stride, int bs, const uint16_t *above, @@ -585,6 +587,7 @@ static INLINE void highbd_d45_predictor(uint16_t *dst, ptrdiff_t stride, int bs, } } +#if CONFIG_MISC_FIXES static INLINE void highbd_d45e_predictor(uint16_t *dst, ptrdiff_t stride, int bs, const uint16_t *above, const uint16_t *left, int bd) { @@ -599,6 +602,7 @@ static INLINE void highbd_d45e_predictor(uint16_t *dst, ptrdiff_t stride, dst += stride; } } +#endif // CONFIG_MISC_FIXES static INLINE void highbd_d117_predictor(uint16_t *dst, ptrdiff_t stride, int bs, const uint16_t *above, |