Skip to content

L
libyuv
Commit a03b8add authored by fbarchard@google.com's avatar fbarchard@google.com
Browse files
Options

Do fewer scale tests to speed up overall unittest 

BUG=273
TEST=timex emuyuv Scale*
R=ryanpetrie@google.com

Review URL: https://webrtc-codereview.appspot.com/2469005

git-svn-id: http://libyuv.googlecode.com/svn/trunk@815 16f28f9a-4ce2-e073-06de-1de4eb20be90
parent adef267e
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 31 deletions
README.chromium
View file @ a03b8add
Name: libyuv Name: libyuv
URL: http://code.google.com/p/libyuv/ URL: http://code.google.com/p/libyuv/
Version: 813 Version: 814
License: BSD License: BSD
License File: LICENSE License File: LICENSE
......
include/libyuv/version.h
View file @ a03b8add
...@@ -11,6 +11,6 @@ ...@@ -11,6 +11,6 @@
#ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT #ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT
#define INCLUDE_LIBYUV_VERSION_H_ #define INCLUDE_LIBYUV_VERSION_H_
#define LIBYUV_VERSION 813 #define LIBYUV_VERSION 814
#endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT
unit_test/scale_argb_test.cc
View file @ a03b8add
...@@ -230,26 +230,26 @@ TEST_FACTOR(Vertical2by3, 1, 2 / 3) ...@@ -230,26 +230,26 @@ TEST_FACTOR(Vertical2by3, 1, 2 / 3)
#undef TEST_FACTOR1 #undef TEST_FACTOR1
#undef TEST_FACTOR #undef TEST_FACTOR
#define TEST_SCALETO1(width, height, filter, max_diff) \ #define TEST_SCALETO1(name, width, height, filter, max_diff) \
TEST_F(libyuvTest, ARGBScaleTo##width##x##height##_##filter) { \ TEST_F(libyuvTest, name##To##width##x##height##_##filter) { \
int diff = ARGBTestFilter(benchmark_width_, benchmark_height_, \ int diff = ARGBTestFilter(benchmark_width_, benchmark_height_, \
width, height, \ width, height, \
kFilter##filter, benchmark_iterations_); \ kFilter##filter, benchmark_iterations_); \
EXPECT_LE(diff, max_diff); \ EXPECT_LE(diff, max_diff); \
} \ } \
TEST_F(libyuvTest, ARGBScaleFrom##width##x##height##_##filter) { \ TEST_F(libyuvTest, name##From##width##x##height##_##filter) { \
int diff = ARGBTestFilter(width, height, \ int diff = ARGBTestFilter(width, height, \
Abs(benchmark_width_), Abs(benchmark_height_), \ Abs(benchmark_width_), Abs(benchmark_height_), \
kFilter##filter, benchmark_iterations_); \ kFilter##filter, benchmark_iterations_); \
EXPECT_LE(diff, max_diff); \ EXPECT_LE(diff, max_diff); \
} \ } \
TEST_F(libyuvTest, ARGBScaleClipTo##width##x##height##_##filter) { \ TEST_F(libyuvTest, name##ClipTo##width##x##height##_##filter) { \
int diff = ARGBClipTestFilter(benchmark_width_, benchmark_height_, \ int diff = ARGBClipTestFilter(benchmark_width_, benchmark_height_, \
width, height, \ width, height, \
kFilter##filter, benchmark_iterations_); \ kFilter##filter, benchmark_iterations_); \
EXPECT_LE(diff, max_diff); \ EXPECT_LE(diff, max_diff); \
} \ } \
TEST_F(libyuvTest, ARGBScaleClipFrom##width##x##height##_##filter) { \ TEST_F(libyuvTest, name##ClipFrom##width##x##height##_##filter) { \
int diff = ARGBClipTestFilter(width, height, \ int diff = ARGBClipTestFilter(width, height, \
Abs(benchmark_width_), Abs(benchmark_height_), \ Abs(benchmark_width_), Abs(benchmark_height_), \
kFilter##filter, benchmark_iterations_); \ kFilter##filter, benchmark_iterations_); \
...@@ -257,16 +257,17 @@ TEST_FACTOR(Vertical2by3, 1, 2 / 3) ...@@ -257,16 +257,17 @@ TEST_FACTOR(Vertical2by3, 1, 2 / 3)
} }
// Test scale to a specified size with all 3 filters. // Test scale to a specified size with all 3 filters.
#define TEST_SCALETO(width, height) \ #define TEST_SCALETO(name, width, height) \
TEST_SCALETO1(width, height, None, 0) \ TEST_SCALETO1(name, width, height, None, 0) \
TEST_SCALETO1(width, height, Bilinear, 2) TEST_SCALETO1(name, width, height, Bilinear, 2) \
TEST_SCALETO1(name, width, height, Box, 2)
TEST_SCALETO(640, 360)
TEST_SCALETO(853, 480) TEST_SCALETO(DISABLED_ARGBScale, 640, 360)
TEST_SCALETO(1280, 720) TEST_SCALETO(ARGBScale, 853, 480)
TEST_SCALETO(1280, 800) TEST_SCALETO(DISABLED_ARGBScale, 1280, 720)
TEST_SCALETO(1366, 768) TEST_SCALETO(DISABLED_ARGBScale, 1280, 800)
TEST_SCALETO(1920, 1080) TEST_SCALETO(DISABLED_ARGBScale, 1366, 768)
TEST_SCALETO(DISABLED_ARGBScale, 1920, 1080)
#undef TEST_SCALETO1 #undef TEST_SCALETO1
#undef TEST_SCALETO #undef TEST_SCALETO
......
unit_test/scale_test.cc
View file @ a03b8add
...@@ -162,14 +162,14 @@ TEST_FACTOR(Vertical2by3, 1, 2 / 3) ...@@ -162,14 +162,14 @@ TEST_FACTOR(Vertical2by3, 1, 2 / 3)
#undef TEST_FACTOR1 #undef TEST_FACTOR1
#undef TEST_FACTOR #undef TEST_FACTOR
#define TEST_SCALETO1(width, height, filter, max_diff) \ #define TEST_SCALETO1(name, width, height, filter, max_diff) \
TEST_F(libyuvTest, ScaleTo##width##x##height##_##filter) { \ TEST_F(libyuvTest, name##To##width##x##height##_##filter) { \
int diff = TestFilter(benchmark_width_, benchmark_height_, \ int diff = TestFilter(benchmark_width_, benchmark_height_, \
width, height, \ width, height, \
kFilter##filter, benchmark_iterations_); \ kFilter##filter, benchmark_iterations_); \
EXPECT_LE(diff, max_diff); \ EXPECT_LE(diff, max_diff); \
} \ } \
TEST_F(libyuvTest, ScaleFrom##width##x##height##_##filter) { \ TEST_F(libyuvTest, name##From##width##x##height##_##filter) { \
int diff = TestFilter(width, height, \ int diff = TestFilter(width, height, \
Abs(benchmark_width_), Abs(benchmark_height_), \ Abs(benchmark_width_), Abs(benchmark_height_), \
kFilter##filter, benchmark_iterations_); \ kFilter##filter, benchmark_iterations_); \
...@@ -177,17 +177,17 @@ TEST_FACTOR(Vertical2by3, 1, 2 / 3) ...@@ -177,17 +177,17 @@ TEST_FACTOR(Vertical2by3, 1, 2 / 3)
} }
// Test scale to a specified size with all 3 filters. // Test scale to a specified size with all 3 filters.
#define TEST_SCALETO(width, height) \ #define TEST_SCALETO(name, width, height) \
TEST_SCALETO1(width, height, None, 0) \ TEST_SCALETO1(name, width, height, None, 0) \
TEST_SCALETO1(width, height, Bilinear, 2) \ TEST_SCALETO1(name, width, height, Bilinear, 2) \
TEST_SCALETO1(width, height, Box, 2) \ TEST_SCALETO1(name, width, height, Box, 2)
TEST_SCALETO(640, 360) TEST_SCALETO(DISABLED_Scale, 640, 360)
TEST_SCALETO(853, 480) TEST_SCALETO(Scale, 853, 480)
TEST_SCALETO(1280, 720) TEST_SCALETO(DISABLED_Scale, 1280, 720)
TEST_SCALETO(1280, 800) TEST_SCALETO(DISABLED_Scale, 1280, 800)
TEST_SCALETO(1366, 768) TEST_SCALETO(DISABLED_Scale, 1366, 768)
TEST_SCALETO(1920, 1080) TEST_SCALETO(DISABLED_Scale, 1920, 1080)
#undef TEST_SCALETO1 #undef TEST_SCALETO1
#undef TEST_SCALETO #undef TEST_SCALETO
......
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