Commit 5d145863 authored by James Zern's avatar James Zern Committed by Gerrit Code Review
Browse files

Merge "remove vpx_highbd_1[02]_sub_pixel_variance4x4_sse4_1" into nextgenv2

parents 997b4912 d0de89a1
......@@ -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,
......
......@@ -1359,6 +1359,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") {
......
......@@ -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(
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment