Improve codec tests to test a broader variety of dimensions.

remoting/codec/codec_test.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <deque>
 #include <stdlib.h>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 204 matching lines @@
             << "Row " << y << " is different";
         original += stride;
         decoded += stride;
       }
     }
   }
 
   // The error at each pixel is the root mean square of the errors in
   // the R, G, and B components, each normalized to [0, 1]. This routine
   // checks that the maximum and mean pixel errors do not exceed given limits.
-void VerifyResultsApprox(const uint8* expected_view_data,
-                         double max_error_limit, double mean_error_limit) {
+  void VerifyResultsApprox(const uint8* expected_view_data,
+                           double max_error_limit, double mean_error_limit) {
     double max_error = 0.0;
     double sum_error = 0.0;
     int error_num = 0;
     for (SkRegion::Iterator i(update_region_); !i.done(); i.next()) {
       const int stride = view_size_.width() * kBytesPerPixel;
       const int offset =  stride * i.rect().top() +
           kBytesPerPixel * i.rect().left();
       const uint8* expected = expected_view_data + offset;
       const uint8* actual = image_data_.get() + offset;
       for (int y = 0; y < i.rect().height(); ++y) {
@@ skipping 113 matching lines @@
   for (int i = 0; i < count; ++i) {
     data->mutable_dirty_region().op(rects[i], SkRegion::kUnion_Op);
   }
   tester->AddRects(rects, count);
 
   encoder->Encode(data, true, base::Bind(
       &VideoEncoderTester::DataAvailable, base::Unretained(tester)));
 }
 
 void TestVideoEncoder(VideoEncoder* encoder, bool strict) {
-  SkISize kSize = SkISize::Make(320, 240);
+  const int kSizes[] = {320, 319, 317, 150};
 
   VideoEncoderMessageTester message_tester;
   message_tester.set_strict(strict);
 
   VideoEncoderTester tester(&message_tester);
 
   scoped_array<uint8> memory;
-  scoped_refptr<CaptureData> data =
-      PrepareEncodeData(kSize, media::VideoFrame::RGB32, &memory);
 
-  std::vector<std::vector<SkIRect> > test_rect_lists = MakeTestRectLists(kSize);
-  for (size_t i = 0; i < test_rect_lists.size(); ++i) {
-    const std::vector<SkIRect>& test_rects = test_rect_lists[i];
-    TestEncodingRects(encoder, &tester, data,
-                      &test_rects[0], test_rects.size());
+  for (size_t xi = 0; xi < arraysize(kSizes); ++xi) {
+    for (size_t yi = 0; yi < arraysize(kSizes); ++yi) {
+      SkISize size = SkISize::Make(kSizes[xi], kSizes[yi]);
+      scoped_refptr<CaptureData> data =
+          PrepareEncodeData(size, media::VideoFrame::RGB32, &memory);
+      std::vector<std::vector<SkIRect> > test_rect_lists =
+          MakeTestRectLists(size);
+      for (size_t i = 0; i < test_rect_lists.size(); ++i) {
+        const std::vector<SkIRect>& test_rects = test_rect_lists[i];
+        TestEncodingRects(encoder, &tester, data,
+                          &test_rects[0], test_rects.size());
+      }
+    }
   }
 }
 
 static void TestEncodeDecodeRects(VideoEncoder* encoder,
                                   VideoEncoderTester* encoder_tester,
                                   VideoDecoderTester* decoder_tester,
                                   scoped_refptr<CaptureData> data,
                                   const SkIRect* rects, int count) {
   data->mutable_dirty_region().setRects(rects, count);
   encoder_tester->AddRects(rects, count);
@@ skipping 101 matching lines @@
   // Check that the decoder correctly re-renders the frame if its client
   // invalidates the frame.
   decoder_tester.ResetRenderedData();
   decoder->Invalidate(view_size, SkRegion(view_rect));
   decoder_tester.RenderFrame();
   decoder_tester.VerifyResultsApprox(expected_view_data.get(),
                                      max_error_limit, mean_error_limit);
 }
 
 }  // namespace remoting