Merge "Code clean of sub_pixel_variance4xh"

James Zern committed 10 years ago

Commit 146ccd32 parents 284be1c 24681634 files · +158 −60Browse files

Showing the changes to test (1 of 4 files). Show all

Unified · Split

test/variance_test.cc+4−4

@@ -1026,8 +1026,8 @@ INSTANTIATE_TEST_CASE_P( · 1025 unmodified lines
1026	make_tuple(3, 4, &vpx_sub_pixel_variance8x16_sse2, 0),	1026	make_tuple(3, 4, &vpx_sub_pixel_variance8x16_sse2, 0),
1027	make_tuple(3, 3, &vpx_sub_pixel_variance8x8_sse2, 0),	1027	make_tuple(3, 3, &vpx_sub_pixel_variance8x8_sse2, 0),
1028	make_tuple(3, 2, &vpx_sub_pixel_variance8x4_sse2, 0),	1028	make_tuple(3, 2, &vpx_sub_pixel_variance8x4_sse2, 0),
1029	make_tuple(2, 3, &vpx_sub_pixel_variance4x8_sse, 0),	1029	make_tuple(2, 3, &vpx_sub_pixel_variance4x8_sse2, 0),
1030	make_tuple(2, 2, &vpx_sub_pixel_variance4x4_sse, 0)));	1030	make_tuple(2, 2, &vpx_sub_pixel_variance4x4_sse2, 0)));
1031		1031
1032	INSTANTIATE_TEST_CASE_P(	1032	INSTANTIATE_TEST_CASE_P(
1033	SSE2, VpxSubpelAvgVarianceTest,	1033	SSE2, VpxSubpelAvgVarianceTest,
@@ -1043,8 +1043,8 @@ INSTANTIATE_TEST_CASE_P( · 9 unmodified lines
1043	make_tuple(3, 4, &vpx_sub_pixel_avg_variance8x16_sse2, 0),	1043	make_tuple(3, 4, &vpx_sub_pixel_avg_variance8x16_sse2, 0),
1044	make_tuple(3, 3, &vpx_sub_pixel_avg_variance8x8_sse2, 0),	1044	make_tuple(3, 3, &vpx_sub_pixel_avg_variance8x8_sse2, 0),
1045	make_tuple(3, 2, &vpx_sub_pixel_avg_variance8x4_sse2, 0),	1045	make_tuple(3, 2, &vpx_sub_pixel_avg_variance8x4_sse2, 0),
1046	make_tuple(2, 3, &vpx_sub_pixel_avg_variance4x8_sse, 0),	1046	make_tuple(2, 3, &vpx_sub_pixel_avg_variance4x8_sse2, 0),
1047	make_tuple(2, 2, &vpx_sub_pixel_avg_variance4x4_sse, 0)));	1047	make_tuple(2, 2, &vpx_sub_pixel_avg_variance4x4_sse2, 0)));
1048	#endif // CONFIG_USE_X86INC	1048	#endif // CONFIG_USE_X86INC
1049		1049
1050	#if CONFIG_VP9_HIGHBITDEPTH	1050	#if CONFIG_VP9_HIGHBITDEPTH