If image sizes are greater than 32768, fixed point stepping will overflow an int. This CL changes t…

unit_test/scale_argb_test.cc

 /*
  *  Copyright 2011 The LibYuv Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS. All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 10 matching lines @@
 namespace libyuv {
 
 #define STRINGIZE(line) #line
 #define FILELINESTR(file, line) file ":" STRINGIZE(line)
 
 // Test scaling with C vs Opt and return maximum pixel difference. 0 = exact.
 static int ARGBTestFilter(int src_width, int src_height,
                           int dst_width, int dst_height,
                           FilterMode f, int benchmark_iterations,
                           int disable_cpu_flags, int benchmark_cpu_info) {
+  if (src_width > 32768 || src_height > 32768 ||

[harryjin, 2016/05/04 04:33:44]

Use a constant?

[harryjin, 2016/05/04 04:33:44]

This whole check can be refactored out to a helper method?

[fbarchard1, 2016/05/05 23:37:02]

Done.

[fbarchard1, 2016/05/05 23:37:02]

Done.

+      dst_width > 32768 || dst_height > 32768) {
+    printf("Warning - size too large to test.  Skipping\n");
+    return 0;
+  }
   int i, j;
   const int b = 0;  // 128 to test for padding/stride.
   int64 src_argb_plane_size = (Abs(src_width) + b * 2) *
       (Abs(src_height) + b * 2) * 4LL;
   int src_stride_argb = (b * 2 + Abs(src_width)) * 4;
 
   align_buffer_page_end(src_argb, src_argb_plane_size);
   if (!src_argb) {
     printf("Skipped.  Alloc failed " FILELINESTR(__FILE__, __LINE__) "\n");
     return 0;
@@ skipping 95 matching lines @@
         return r;
       }
     }
   }
   return 0;
 }
 
 static int ARGBClipTestFilter(int src_width, int src_height,
                               int dst_width, int dst_height,
                               FilterMode f, int benchmark_iterations) {
+  if (src_width > 32768 || src_height > 32768 ||
+      dst_width > 32768 || dst_height > 32768) {
+    printf("Warning - size too large to test.  Skipping\n");
+    return 0;
+  }  
   const int b = 128;
   int64 src_argb_plane_size = (Abs(src_width) + b * 2) *
       (Abs(src_height) + b * 2) * 4;
   int src_stride_argb = (b * 2 + Abs(src_width)) * 4;
 
   align_buffer_64(src_argb, src_argb_plane_size);
   if (!src_argb) {
     printf("Skipped.  Alloc failed " FILELINESTR(__FILE__, __LINE__) "\n");
     return 0;
   }
@@ skipping 291 matching lines @@
                                  benchmark_height_ * 3 / 2,
                                  benchmark_width_, benchmark_height_,
                                  libyuv::kFilterBilinear,
                                  benchmark_iterations_,
                                  disable_cpu_flags_, benchmark_cpu_info_);
   EXPECT_LE(diff, 10);
 }
 
 
 }  // namespace libyuv