diff --git a/README.chromium b/README.chromium index 31fc32edf..cd771b0a0 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 619 +Version: 620 License: BSD License File: LICENSE diff --git a/include/libyuv/version.h b/include/libyuv/version.h index 93df7444d..0af47939a 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 619 +#define LIBYUV_VERSION 620 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT diff --git a/unit_test/scale_argb_test.cc b/unit_test/scale_argb_test.cc index 18bea2bd6..f88ffdb89 100644 --- a/unit_test/scale_argb_test.cc +++ b/unit_test/scale_argb_test.cc @@ -413,4 +413,31 @@ TEST_F(libyuvTest, ARGBScaleTo853x480_Bilinear) { EXPECT_LE(max_diff, 1); } + +TEST_F(libyuvTest, ARGBScaleFrom640x360_None) { + int src_width = 640; + int src_height = 360; + int dst_width = benchmark_width_; + int dst_height = benchmark_height_; + + int max_diff = ARGBTestFilter(src_width, src_height, + dst_width, dst_height, + kFilterNone, + benchmark_iterations_); + EXPECT_LE(max_diff, 2); +} + +TEST_F(libyuvTest, ARGBScaleFrom640x360_Bilinear) { + int src_width = 640; + int src_height = 360; + int dst_width = benchmark_width_; + int dst_height = benchmark_height_; + + int max_diff = ARGBTestFilter(src_width, src_height, + dst_width, dst_height, + kFilterBilinear, + benchmark_iterations_); + EXPECT_LE(max_diff, 2); +} + } // namespace libyuv diff --git a/unit_test/scale_test.cc b/unit_test/scale_test.cc index e2c9e443f..dd0b46599 100644 --- a/unit_test/scale_test.cc +++ b/unit_test/scale_test.cc @@ -551,4 +551,30 @@ TEST_F(libyuvTest, ScaleTo853x480_Box) { EXPECT_LE(max_diff, 1); } +TEST_F(libyuvTest, ScaleFrom640x360_None) { + int src_width = 640; + int src_height = 360; + int dst_width = benchmark_width_; + int dst_height = benchmark_height_; + + int max_diff = TestFilter(src_width, src_height, + dst_width, dst_height, + kFilterNone, + benchmark_iterations_); + EXPECT_LE(max_diff, 2); +} + +TEST_F(libyuvTest, ScaleFrom640x360_Bilinear) { + int src_width = 640; + int src_height = 360; + int dst_width = benchmark_width_; + int dst_height = benchmark_height_; + + int max_diff = TestFilter(src_width, src_height, + dst_width, dst_height, + kFilterBilinear, + benchmark_iterations_); + EXPECT_LE(max_diff, 2); +} + } // namespace libyuv