Change scale factors to test QVGA to/from CIF

BUG=261
TESTED=valgrind
R=tpsiaki@google.com

Review URL: https://webrtc-codereview.appspot.com/5129004

git-svn-id: http://libyuv.googlecode.com/svn/trunk@895 16f28f9a-4ce2-e073-06de-1de4eb20be90

README.chromium

 Name: libyuv
 URL: http://code.google.com/p/libyuv/
-Version: 894
+Version: 895
 License: BSD
 License File: LICENSE
 

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

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
 

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
 

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