From 5ed2b2e465cb97d556f281456c6c238215109ca2 Mon Sep 17 00:00:00 2001 From: "fbarchard@google.com" Date: Tue, 10 Dec 2013 01:25:35 +0000 Subject: [PATCH] Test scaling to/from 1 pixel BUG=none TEST=scale unittests updated to test to/from 1 pixel R=tpsiaki@google.com Review URL: https://webrtc-codereview.appspot.com/5479005 git-svn-id: http://libyuv.googlecode.com/svn/trunk@908 16f28f9a-4ce2-e073-06de-1de4eb20be90 --- README.chromium | 2 +- include/libyuv/version.h | 2 +- unit_test/scale_argb_test.cc | 1 + unit_test/scale_test.cc | 1 + unit_test/unit_test.cc | 4 ++-- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/README.chromium b/README.chromium index 47527e86a..a9345a287 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 907 +Version: 908 License: BSD License File: LICENSE diff --git a/include/libyuv/version.h b/include/libyuv/version.h index 492bd27f3..b346978fa 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 907 +#define LIBYUV_VERSION 908 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT diff --git a/unit_test/scale_argb_test.cc b/unit_test/scale_argb_test.cc index 23fc3ea54..ea4d4d145 100644 --- a/unit_test/scale_argb_test.cc +++ b/unit_test/scale_argb_test.cc @@ -264,6 +264,7 @@ TEST_FACTOR(Vertical2by3, 1, 2 / 3) TEST_SCALETO1(name, width, height, Bilinear, 3) \ TEST_SCALETO1(name, width, height, Box, 3) +TEST_SCALETO(ARGBScale, 1, 1) TEST_SCALETO(ARGBScale, 320, 240) TEST_SCALETO(ARGBScale, 352, 288) TEST_SCALETO(ARGBScale, 640, 360) diff --git a/unit_test/scale_test.cc b/unit_test/scale_test.cc index a81990beb..c6f256046 100644 --- a/unit_test/scale_test.cc +++ b/unit_test/scale_test.cc @@ -183,6 +183,7 @@ TEST_FACTOR(Vertical2by3, 1, 2 / 3) TEST_SCALETO1(name, width, height, Bilinear, 3) \ TEST_SCALETO1(name, width, height, Box, 3) +TEST_SCALETO(Scale, 1, 1) TEST_SCALETO(Scale, 320, 240) TEST_SCALETO(Scale, 352, 288) TEST_SCALETO(Scale, 640, 360) diff --git a/unit_test/unit_test.cc b/unit_test/unit_test.cc index 118a1e466..b11bd2463 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_(32), - benchmark_height_(24) { + benchmark_iterations_(BENCHMARK_ITERATIONS), benchmark_width_(22), + benchmark_height_(14) { const char* repeat = getenv("LIBYUV_REPEAT"); if (repeat) { benchmark_iterations_ = atoi(repeat); // NOLINT