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 339 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);
+  int kSizes[] = {320, 319, 317, 240, 160};

[simonmorris, 2012/10/19 15:48:08]

int -> const int ?

[Wez, 2012/10/19 20:56:53]

Done.

 
   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) {

[Sergey Ulanov, 2012/10/19 17:50:26]

whoa, it's 25 tests total. How much time does it take to run this test now? If
it is too slow now then maybe it's better to vary only one dimension while
keeping other one fixed. That will be only 10 size combinations and about the
same coverage.

[Wez, 2012/10/19 20:56:53]

I've reduced it to sixteen sizes; I want to test frames that are much wider than
they are high, and vice-versa, and also frames with width or height that is
non-zero mod 2 and 4.

+      SkISize size = SkISize::Make(kSizes[xi], kSizes[yi]);
+      scoped_refptr<CaptureData> data =
+        PrepareEncodeData(size, media::VideoFrame::RGB32, &memory);

[Sergey Ulanov, 2012/10/19 17:50:26]

style police: 4 spaces indent here please.

[Wez, 2012/10/19 20:56:53]

Done.

+
+      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