remove vpx_highbd_1[02]_sub_pixel_variance4x4_sse4_1

these cause ASan errors VP10/EndToEndTestLarge.EndtoEndPSNRTest

BUG=webm:1242

Change-Id: I0334e3b255b14e18f61970c3721ae748dc79727b

diff --git a/test/variance_test.cc b/test/variance_test.cc
index 8ac85118ca8e6b9c4bb7b6c3b026cbf891a746f7..f874f1dd8da89ca7e3eae3047b851a3e0c57d0e7 100644 (file)
--- a/test/variance_test.cc
+++ b/test/variance_test.cc
@@ -1151,9 +1151,7 @@ INSTANTIATE_TEST_CASE_P(
 INSTANTIATE_TEST_CASE_P(
     SSE4_1, VpxSubpelVarianceTest,
     ::testing::Values(
-         make_tuple(2, 2, &vpx_highbd_8_sub_pixel_variance4x4_sse4_1, 8),
-         make_tuple(2, 2, &vpx_highbd_10_sub_pixel_variance4x4_sse4_1, 10),
-         make_tuple(2, 2, &vpx_highbd_12_sub_pixel_variance4x4_sse4_1, 12)));
+         make_tuple(2, 2, &vpx_highbd_8_sub_pixel_variance4x4_sse4_1, 8)));
 
 INSTANTIATE_TEST_CASE_P(
     SSE4_1, VpxSubpelAvgVarianceTest,

diff --git a/vpx_dsp/vpx_dsp_rtcd_defs.pl b/vpx_dsp/vpx_dsp_rtcd_defs.pl
index 7bae0375d049241cf6cf65bb50745990a407e272..25c7f79a7e4bed749620a2ac24cbc83bf589e55d 100644 (file)
--- a/vpx_dsp/vpx_dsp_rtcd_defs.pl
+++ b/vpx_dsp/vpx_dsp_rtcd_defs.pl
@@ -1356,6 +1356,8 @@ if (vpx_config("CONFIG_VP9_HIGHBITDEPTH") eq "yes") {
       }
     }
   }
+  $vpx_highbd_10_sub_pixel_variance4x4_sse4_1='';
+  $vpx_highbd_12_sub_pixel_variance4x4_sse4_1='';
 }  # CONFIG_VP9_HIGHBITDEPTH
 
 if (vpx_config("CONFIG_EXT_INTER") eq "yes") {

diff --git a/vpx_dsp/x86/highbd_variance_sse4.c b/vpx_dsp/x86/highbd_variance_sse4.c
index 54fc609fbe92374f76301013f34f572c92aa808b..82b4deb4671168c3deeb249e4ff61bf0172688ec 100644 (file)
--- a/vpx_dsp/x86/highbd_variance_sse4.c
+++ b/vpx_dsp/x86/highbd_variance_sse4.c
@@ -130,46 +130,6 @@ uint32_t vpx_highbd_8_sub_pixel_variance4x4_sse4_1(
                                   4, dst, dst_stride, sse);
 }
 
-uint32_t vpx_highbd_10_sub_pixel_variance4x4_sse4_1(
-    const uint8_t *src, int  src_stride,
-    int xoffset, int  yoffset,
-    const uint8_t *dst, int dst_stride,
-    uint32_t *sse) {
-
-  uint16_t fdata3[(4 + 1) * 4];
-  uint16_t temp2[4 * 4];
-
-  vpx_highbd_var_filter_block2d_bil_first_pass(
-      src, fdata3, src_stride, 1, 4 + 1,
-      4, bilinear_filters_2t[xoffset]);
-  vpx_highbd_var_filter_block2d_bil_second_pass(
-      fdata3, temp2, 4, 4, 4, 4,
-      bilinear_filters_2t[yoffset]);
-
-  return vpx_highbd_10_variance4x4(CONVERT_TO_BYTEPTR(temp2),
-                                   4, dst, dst_stride, sse);
-}
-
-uint32_t vpx_highbd_12_sub_pixel_variance4x4_sse4_1(
-    const uint8_t *src, int  src_stride,
-    int xoffset, int  yoffset,
-    const uint8_t *dst, int dst_stride,
-    uint32_t *sse) {
-
-  uint16_t fdata3[(4 + 1) * 4];
-  uint16_t temp2[4 * 4];
-
-  vpx_highbd_var_filter_block2d_bil_first_pass(
-      src, fdata3, src_stride, 1, 4 + 1,
-      4, bilinear_filters_2t[xoffset]);
-  vpx_highbd_var_filter_block2d_bil_second_pass(
-      fdata3, temp2, 4, 4, 4, 4,
-      bilinear_filters_2t[yoffset]);
-
-  return vpx_highbd_12_variance4x4(CONVERT_TO_BYTEPTR(temp2),
-                                   4, dst, dst_stride, sse);
-}
-
 // Sub-pixel average
 
 uint32_t vpx_highbd_8_sub_pixel_avg_variance4x4_sse4_1(