diff options
| -rw-r--r-- | README.chromium | 2 | ||||
| -rw-r--r-- | include/libyuv/version.h | 2 | ||||
| -rw-r--r-- | unit_test/scale_argb_test.cc | 4 | ||||
| -rw-r--r-- | unit_test/scale_test.cc | 4 | ||||
| -rw-r--r-- | unit_test/unit_test.cc | 4 |
5 files changed, 6 insertions, 10 deletions
diff --git a/README.chromium b/README.chromium index fca38c07..573e9086 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 894 +Version: 895 License: BSD License File: LICENSE diff --git a/include/libyuv/version.h b/include/libyuv/version.h index cc24ca80..ef91aac0 100644 --- a/include/libyuv/version.h +++ b/include/libyuv/version.h @@ -11,6 +11,6 @@ #ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT #define INCLUDE_LIBYUV_VERSION_H_ -#define LIBYUV_VERSION 894 +#define LIBYUV_VERSION 895 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT diff --git a/unit_test/scale_argb_test.cc b/unit_test/scale_argb_test.cc index a13a994f..92f1a7a5 100644 --- a/unit_test/scale_argb_test.cc +++ b/unit_test/scale_argb_test.cc @@ -262,13 +262,11 @@ TEST_FACTOR(Vertical2by3, 1, 2 / 3) TEST_SCALETO1(name, width, height, Linear, 2) \ TEST_SCALETO1(name, width, height, Bilinear, 2) +TEST_SCALETO(ARGBScale, 320, 240) TEST_SCALETO(ARGBScale, 352, 288) TEST_SCALETO(ARGBScale, 640, 360) TEST_SCALETO(ARGBScale, 853, 480) TEST_SCALETO(ARGBScale, 1280, 720) -TEST_SCALETO(ARGBScale, 1280, 800) -TEST_SCALETO(ARGBScale, 1366, 768) -TEST_SCALETO(ARGBScale, 1920, 1080) #undef TEST_SCALETO1 #undef TEST_SCALETO diff --git a/unit_test/scale_test.cc b/unit_test/scale_test.cc index 92e59d0a..84682d37 100644 --- a/unit_test/scale_test.cc +++ b/unit_test/scale_test.cc @@ -183,13 +183,11 @@ TEST_FACTOR(Vertical2by3, 1, 2 / 3) TEST_SCALETO1(name, width, height, Bilinear, 3) \ TEST_SCALETO1(name, width, height, Box, 3) +TEST_SCALETO(Scale, 320, 240) TEST_SCALETO(Scale, 352, 288) TEST_SCALETO(Scale, 640, 360) TEST_SCALETO(Scale, 853, 480) TEST_SCALETO(Scale, 1280, 720) -TEST_SCALETO(Scale, 1280, 800) -TEST_SCALETO(Scale, 1366, 768) -TEST_SCALETO(Scale, 1920, 1080) #undef TEST_SCALETO1 #undef TEST_SCALETO diff --git a/unit_test/unit_test.cc b/unit_test/unit_test.cc index d1bbffa4..12e8a567 100644 --- a/unit_test/unit_test.cc +++ b/unit_test/unit_test.cc @@ -19,8 +19,8 @@ #define BENCHMARK_ITERATIONS 1 libyuvTest::libyuvTest() : rotate_max_w_(128), rotate_max_h_(128), - benchmark_iterations_(BENCHMARK_ITERATIONS), benchmark_width_(33), - benchmark_height_(17) { + benchmark_iterations_(BENCHMARK_ITERATIONS), benchmark_width_(353), + benchmark_height_(264) { const char* repeat = getenv("LIBYUV_REPEAT"); if (repeat) { benchmark_iterations_ = atoi(repeat); // NOLINT |