Make sure MediaStreamVideoSource support cropping.

content/renderer/media/media_stream_video_source_unittest.cc

 // Copyright 2014 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 <string>
 #include <vector>
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/renderer/media/media_stream_video_source.h"
@@ skipping 46 matching lines @@
   MediaStreamVideoSourceTest()
       : number_of_successful_constraints_applied_(0),
         number_of_failed_constraints_applied_(0),
         mock_source_(new MockMediaStreamVideoSource(&factory_, true)) {
     media::VideoCaptureFormats formats;
     formats.push_back(media::VideoCaptureFormat(
         gfx::Size(1280, 720), 30, media::PIXEL_FORMAT_I420));
     formats.push_back(media::VideoCaptureFormat(
         gfx::Size(640, 480), 30, media::PIXEL_FORMAT_I420));
     formats.push_back(media::VideoCaptureFormat(
-        gfx::Size(640, 400), 30, media::PIXEL_FORMAT_I420));
-    formats.push_back(media::VideoCaptureFormat(
         gfx::Size(352, 288), 30, media::PIXEL_FORMAT_I420));
     formats.push_back(media::VideoCaptureFormat(
         gfx::Size(320, 240), 30, media::PIXEL_FORMAT_I420));
     mock_source_->SetSupportedFormats(formats);
     webkit_source_.initialize(base::UTF8ToUTF16("dummy_source_id"),
                               blink::WebMediaStreamSource::TypeVideo,
                               base::UTF8ToUTF16("dummy_source_name"));
     webkit_source_.setExtraData(mock_source_);
   }
 
@@ skipping 44 matching lines @@
   int NumberOfSuccessConstraintsCallbacks() const {
     return number_of_successful_constraints_applied_;
   }
 
   int NumberOfFailedConstraintsCallbacks() const {
     return number_of_failed_constraints_applied_;
   }
 
   MockMediaStreamVideoSource* mock_source() { return mock_source_; }
 
+  // Test that the source crops to the requested max width and
+  // height even though the camera delivers a larger frame.
+  // TODO(perkj): Frame resolution should be verified in MediaStreamVideoTrack
+  // and not in the adapter.
+  void TestSourceCropFrame(int capture_w,
+                           int capture_h,
+                           const blink::WebMediaConstraints& constraints,
+                           int extpected_h,

[tommi (sloooow) - chröme, 2014/03/06 10:14:09]

expected_h
(or even expected_height)

[perkj_chrome, 2014/03/06 12:45:42]

Done.

[tommi (sloooow) - chröme, 2014/03/06 13:28:50]

missed extpected -> expected

[perkj_chrome, 2014/03/06 14:22:53]

Done.

+                           int expected_w) {
+    // Expect the source to start capture with the supported resolution.
+    CreateTrackAndStartSource(constraints, capture_w, capture_h , 30);
+
+    ASSERT_TRUE(mock_source()->GetAdapter());
+    MockVideoSource* adapter = static_cast<MockVideoSource*>(
+        mock_source()->GetAdapter());
+    EXPECT_EQ(0, adapter->GetFrameNum());
+
+    scoped_refptr<media::VideoFrame> frame =
+        media::VideoFrame::CreateBlackFrame(gfx::Size(capture_w, capture_h));
+    mock_source()->DeliverVideoFrame(frame);
+    EXPECT_EQ(1, adapter->GetFrameNum());
+
+    // Expect the delivered frame to be cropped.
+    EXPECT_EQ(extpected_h, adapter->GetLastFrameWidth());
+    EXPECT_EQ(expected_w, adapter->GetLastFrameHeight());
+  }
+
+

[tommi (sloooow) - chröme, 2014/03/06 10:14:09]

one empty line

[perkj_chrome, 2014/03/06 12:45:42]

Done.

  private:
   void OnConstraintsApplied(MediaStreamSource* source, bool success) {
     ASSERT_EQ(source, webkit_source_.extraData());
 
     if (success)
       ++number_of_successful_constraints_applied_;
     else
       ++number_of_failed_constraints_applied_;
   }
 
@@ skipping 202 matching lines @@
           gfx::Size(MediaStreamVideoSource::kDefaultWidth,
                     MediaStreamVideoSource::kDefaultHeight));
    mock_source()->DeliverVideoFrame(frame);
    EXPECT_EQ(1, adapter->GetFrameNum());
    EXPECT_EQ(MediaStreamVideoSource::kDefaultWidth,
              adapter->GetLastFrameWidth());
    EXPECT_EQ(MediaStreamVideoSource::kDefaultHeight,
              adapter->GetLastFrameHeight());
 }
 
+// Test that the source crops to the requested max width and
+// height even though the camera delivers a larger frame.
+TEST_F(MediaStreamVideoSourceTest, DeliverCroppedVideoFrameOptional640360) {
+  ConstraintsFactory factory;
+  factory.AddOptional(MediaStreamVideoSource::kMaxWidth, 640);
+  factory.AddOptional(MediaStreamVideoSource::kMaxHeight, 360);
+  TestSourceCropFrame(640, 480, factory.CreateConstraints(), 640, 360);
+}
+
+TEST_F(MediaStreamVideoSourceTest, DeliverCroppedVideoFrameMandatory640360) {
+  ConstraintsFactory factory;
+  factory.AddMandatory(MediaStreamVideoSource::kMaxWidth, 640);
+  factory.AddMandatory(MediaStreamVideoSource::kMaxHeight, 360);
+  TestSourceCropFrame(640, 480, factory.CreateConstraints(), 640, 360);
+}
+
+TEST_F(MediaStreamVideoSourceTest, DeliverCroppedVideoFrameMandatory732489) {
+  ConstraintsFactory factory;
+  factory.AddMandatory(MediaStreamVideoSource::kMaxWidth, 732);
+  factory.AddMandatory(MediaStreamVideoSource::kMaxHeight, 489);
+  factory.AddMandatory(MediaStreamVideoSource::kMinWidth, 732);
+  factory.AddMandatory(MediaStreamVideoSource::kMinWidth, 489);
+  TestSourceCropFrame(1280, 720, factory.CreateConstraints(), 732, 489);
+}
+
+// Test that the source crops to the requested max width and
+// height even though the requested frame has odd size.
+TEST_F(MediaStreamVideoSourceTest, DeliverCroppedVideoFrame637359) {
+  ConstraintsFactory factory;
+  factory.AddOptional(MediaStreamVideoSource::kMaxWidth, 637);
+  factory.AddOptional(MediaStreamVideoSource::kMaxHeight, 359);
+  TestSourceCropFrame(640, 480, factory.CreateConstraints(), 637, 359);
+}
+
+TEST_F(MediaStreamVideoSourceTest, DeliverSmallerSizeWhenTooLargeMax) {
+  ConstraintsFactory factory;
+  factory.AddOptional(MediaStreamVideoSource::kMaxWidth, 1920);
+  factory.AddOptional(MediaStreamVideoSource::kMaxHeight, 1080);
+  factory.AddOptional(MediaStreamVideoSource::kMinWidth, 1280);
+  factory.AddOptional(MediaStreamVideoSource::kMinHeight, 720);
+  TestSourceCropFrame(1280, 720, factory.CreateConstraints(), 1280, 720);
+}
 
 }  // namespace content