diff --git a/README.chromium b/README.chromium index 32f23eda6..24a577f8d 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 295 +Version: 296 License: BSD License File: LICENSE diff --git a/include/libyuv/version.h b/include/libyuv/version.h index 95ebab17a..58b533b2b 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 295 +#define LIBYUV_VERSION 296 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT diff --git a/unit_test/scale_test.cc b/unit_test/scale_test.cc index 082ab9a67..6db004053 100644 --- a/unit_test/scale_test.cc +++ b/unit_test/scale_test.cc @@ -317,4 +317,47 @@ TEST_F(libyuvTest, ScaleTo853Wrong) { } } +// A one off test for a screen cast resolution scale. +TEST_F(libyuvTest, ScaleTo684) { + int src_width = 686; + int src_height = 557; + int dst_width = 684; + int dst_height = 552; + + for (int f = 0; f < 3; ++f) { + int err = TestFilter(src_width, src_height, + dst_width, dst_height, + static_cast(f), 1); + EXPECT_GE(1, err); + } +} + +TEST_F(libyuvTest, ScaleTo342) { + int src_width = 686; + int src_height = 557; + int dst_width = 342; + int dst_height = 276; + + for (int f = 0; f < 3; ++f) { + int err = TestFilter(src_width, src_height, + dst_width, dst_height, + static_cast(f), 1); + EXPECT_GE(1, err); + } +} + +TEST_F(libyuvTest, ScaleToHalf342) { + int src_width = 684; + int src_height = 552; + int dst_width = 342; + int dst_height = 276; + + for (int f = 0; f < 3; ++f) { + int err = TestFilter(src_width, src_height, + dst_width, dst_height, + static_cast(f), 1); + EXPECT_GE(1, err); + } +} + } // namespace libyuv