diff options
| author | Johann <johannkoenig@google.com> | 2017-04-14 08:24:59 -0700 |
|---|---|---|
| committer | Johann <johannkoenig@google.com> | 2017-04-14 08:43:06 -0700 |
| commit | eaa7cdf05d5da61171d53904f4f0eda4864e58c1 (patch) | |
| tree | bae6b5c3dfb79ebf1b59d7952f5fd32dbd5c7fcc | |
| parent | bdb593ab200fc4c4e1f0d4cab35ea7963f61c20e (diff) | |
| download | libvpx-eaa7cdf05d5da61171d53904f4f0eda4864e58c1.tar libvpx-eaa7cdf05d5da61171d53904f4f0eda4864e58c1.tar.gz libvpx-eaa7cdf05d5da61171d53904f4f0eda4864e58c1.tar.bz2 libvpx-eaa7cdf05d5da61171d53904f4f0eda4864e58c1.zip | |
Disable vpx_comp_avg_pred_sse2
Failures on windows:
unknown file: error: SEH exception with code 0xc0000005 thrown in the
test body.
Alignment check errors on linux:
test_libvpx: ../libvpx/vpx_dsp/variance.c:230: void
vpx_comp_avg_pred_c(uint8_t *, const uint8_t *, int, int, const uint8_t
*, int): Assertion `((intptr_t)comp_pred & 0xf) == 0' failed.
BUG=webm:1390
Change-Id: I5eed5381c0f1a8fe594a128eb415e77232f544ea
| -rw-r--r-- | test/comp_avg_pred_test.cc | 3 | ||||
| -rw-r--r-- | vpx_dsp/variance.c | 3 | ||||
| -rw-r--r-- | vpx_dsp/vpx_dsp_rtcd_defs.pl | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/test/comp_avg_pred_test.cc b/test/comp_avg_pred_test.cc index 2aed7cba1..e24471920 100644 --- a/test/comp_avg_pred_test.cc +++ b/test/comp_avg_pred_test.cc @@ -151,7 +151,8 @@ TEST_P(AvgPredTest, DISABLED_Speed) { INSTANTIATE_TEST_CASE_P(C, AvgPredTest, ::testing::Values(&vpx_comp_avg_pred_c)); -#if HAVE_SSE2 +// TODO(johannkoenig): https://bugs.chromium.org/p/webm/issues/detail?id=1390 +#if 0 // HAVE_SSE2 INSTANTIATE_TEST_CASE_P(SSE2, AvgPredTest, ::testing::Values(&vpx_comp_avg_pred_sse2)); #endif // HAVE_SSE2 diff --git a/vpx_dsp/variance.c b/vpx_dsp/variance.c index b1744047a..8ae642d6d 100644 --- a/vpx_dsp/variance.c +++ b/vpx_dsp/variance.c @@ -226,9 +226,6 @@ MSE(8, 8) void vpx_comp_avg_pred_c(uint8_t *comp_pred, const uint8_t *pred, int width, int height, const uint8_t *ref, int ref_stride) { int i, j; - /* comp_pred and pred must be 16 byte aligned. */ - assert(((intptr_t)comp_pred & 0xf) == 0); - assert(((intptr_t)pred & 0xf) == 0); for (i = 0; i < height; ++i) { for (j = 0; j < width; ++j) { diff --git a/vpx_dsp/vpx_dsp_rtcd_defs.pl b/vpx_dsp/vpx_dsp_rtcd_defs.pl index 201af15bd..bc628f538 100644 --- a/vpx_dsp/vpx_dsp_rtcd_defs.pl +++ b/vpx_dsp/vpx_dsp_rtcd_defs.pl @@ -1303,7 +1303,7 @@ add_proto qw/unsigned int vpx_get4x4sse_cs/, "const unsigned char *src_ptr, int specialize qw/vpx_get4x4sse_cs neon msa/; add_proto qw/void vpx_comp_avg_pred/, "uint8_t *comp_pred, const uint8_t *pred, int width, int height, const uint8_t *ref, int ref_stride"; - specialize qw/vpx_comp_avg_pred sse2/; + specialize qw/vpx_comp_avg_pred/; # # Subpixel Variance |