shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "re-enable vpx_comp_avg_pred_sse2"

--- a/test/comp_avg_pred_test.cc

+++ b/test/comp_avg_pred_test.cc

@@ -152,8 +152,7 @@

 INSTANTIATE_TEST_CASE_P(C, AvgPredTest,

                         ::testing::Values(&vpx_comp_avg_pred_c));

-// TODO(johannkoenig): https://bugs.chromium.org/p/webm/issues/detail?id=1390

-#if 0   // HAVE_SSE2

+#if HAVE_SSE2

 INSTANTIATE_TEST_CASE_P(SSE2, AvgPredTest,

                         ::testing::Values(&vpx_comp_avg_pred_sse2));

 #endif  // HAVE_SSE2

--- a/vpx_dsp/variance.c

+++ b/vpx_dsp/variance.c

@@ -226,6 +226,9 @@

 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) {

--- a/vpx_dsp/vpx_dsp_rtcd_defs.pl

+++ b/vpx_dsp/vpx_dsp_rtcd_defs.pl

@@ -1303,7 +1303,7 @@

   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/;

+  specialize qw/vpx_comp_avg_pred sse2/;

 #

 # Subpixel Variance