From 76f86067a26810e6d7f3f8e65f136d808d4f144d Mon Sep 17 00:00:00 2001 From: "fbarchard@google.com" Date: Wed, 5 Jun 2013 15:10:43 +0000 Subject: [PATCH] Additional scale resolutions tested BUG=none TEST=*Scale* R=mikhal@webrtc.org Review URL: https://webrtc-codereview.appspot.com/1608005 git-svn-id: http://libyuv.googlecode.com/svn/trunk@718 16f28f9a-4ce2-e073-06de-1de4eb20be90 --- README.chromium | 2 +- include/libyuv/version.h | 2 +- unit_test/scale_argb_test.cc | 2 ++ unit_test/scale_test.cc | 2 ++ util/psnr.cc | 4 ++-- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/README.chromium b/README.chromium index f8e0fc32e..45f0766c1 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 716 +Version: 718 License: BSD License File: LICENSE diff --git a/include/libyuv/version.h b/include/libyuv/version.h index 6f278507c..aab34d900 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 716 +#define LIBYUV_VERSION 718 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT diff --git a/unit_test/scale_argb_test.cc b/unit_test/scale_argb_test.cc index 5421ecb5e..dc44d3b60 100644 --- a/unit_test/scale_argb_test.cc +++ b/unit_test/scale_argb_test.cc @@ -274,7 +274,9 @@ TEST_FACTOR(3by8, 3 / 8) TEST_SCALETO(640, 360) TEST_SCALETO(853, 480) TEST_SCALETO(1280, 720) +TEST_SCALETO(1280, 800) TEST_SCALETO(1366, 768) +TEST_SCALETO(1920, 1080) #undef TEST_SCALETO1 #undef TEST_SCALETO diff --git a/unit_test/scale_test.cc b/unit_test/scale_test.cc index b12982fbc..c435a8491 100644 --- a/unit_test/scale_test.cc +++ b/unit_test/scale_test.cc @@ -218,7 +218,9 @@ TEST_FACTOR(3by8, 3 / 8) TEST_SCALETO(640, 360) TEST_SCALETO(853, 480) TEST_SCALETO(1280, 720) +TEST_SCALETO(1280, 800) TEST_SCALETO(1366, 768) +TEST_SCALETO(1920, 1080) #undef TEST_SCALETO1 #undef TEST_SCALETO diff --git a/util/psnr.cc b/util/psnr.cc index 8799d6af6..e480efc98 100644 --- a/util/psnr.cc +++ b/util/psnr.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "./psnr.h" +#include "./psnr.h" // NOLINT #include @@ -23,7 +23,7 @@ extern "C" { #endif -typedef unsigned int uint32; // NOLINT +typedef unsigned int uint32; // NOLINT #ifdef _MSC_VER typedef unsigned __int64 uint64; #else // COMPILER_MSVC