New flag is_screencast in VideoOptions.

webrtc/api/videosource_unittest.cc

 /*
  *  Copyright 2012 The WebRTC 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 24 matching lines @@
 
 }  // anonymous namespace
 
 
 // TestVideoCapturer extends cricket::FakeVideoCapturer so it can be used for
 // testing without known camera formats.
 // It keeps its own lists of cricket::VideoFormats for the unit tests in this
 // file.
 class TestVideoCapturer : public cricket::FakeVideoCapturer {
  public:
-  TestVideoCapturer() : test_without_formats_(false) {
+  TestVideoCapturer(bool is_screencast)
+      : FakeVideoCapturer(is_screencast),
+        test_without_formats_(false) {
     std::vector<cricket::VideoFormat> formats;
     formats.push_back(cricket::VideoFormat(1280, 720,
         cricket::VideoFormat::FpsToInterval(30), cricket::FOURCC_I420));
     formats.push_back(cricket::VideoFormat(640, 480,
         cricket::VideoFormat::FpsToInterval(30), cricket::FOURCC_I420));
     formats.push_back(cricket::VideoFormat(640, 400,
             cricket::VideoFormat::FpsToInterval(30), cricket::FOURCC_I420));
     formats.push_back(cricket::VideoFormat(320, 240,
         cricket::VideoFormat::FpsToInterval(30), cricket::FOURCC_I420));
     formats.push_back(cricket::VideoFormat(352, 288,
@@ skipping 47 matching lines @@
   MediaSourceInterface::SourceState state() const { return state_; }
 
  private:
   MediaSourceInterface::SourceState state_;
   rtc::scoped_refptr<VideoSourceInterface> source_;
 };
 
 class VideoSourceTest : public testing::Test {
  protected:
   VideoSourceTest()
-      : capturer_cleanup_(new TestVideoCapturer()),
-        capturer_(capturer_cleanup_.get()),
-        channel_manager_(new cricket::ChannelManager(
+      : channel_manager_(new cricket::ChannelManager(
           new cricket::FakeMediaEngine(), rtc::Thread::Current())) {
+    InitScreencast(false);
+  }
+  void InitScreencast(bool is_screencast) {

[pthatcher1, 2016/02/25 06:57:06]

I still don't like the name.

How about two methods:

Init()  // Like current InitScreencast(false);
InitScreencast()  // Like current InitScreencast(true);

?

Make a third that those two call if you think it's worth it.  I'm more concerned
with the call sites than the implementations.

[nisse-webrtc, 2016/02/25 08:59:35]

I've renamed the shared method to InitCapturer(bool is_screencast), and changed
InitScreencast as you sugggested.

+    capturer_cleanup_ = rtc::scoped_ptr<TestVideoCapturer>(
+        new TestVideoCapturer(is_screencast));
+    capturer_ = capturer_cleanup_.get();
   }
 
   void SetUp() {
     ASSERT_TRUE(channel_manager_->Init());
   }
 
   void CreateVideoSource() {
     CreateVideoSource(NULL);
   }
 
@@ skipping 339 matching lines @@
   EXPECT_EQ(288, format->height);
   EXPECT_EQ(30, format->framerate());
 
   EXPECT_EQ(rtc::Optional<bool>(false),
             source_->options()->video_noise_reduction);
 }
 
 // Tests that the source starts video with the default resolution for
 // screencast if no constraint is set.
 TEST_F(VideoSourceTest, ScreencastResolutionNoConstraint) {
+  InitScreencast(true);
   capturer_->TestWithoutCameraFormats();
-  capturer_->SetScreencast(true);
 
   CreateVideoSource();
   EXPECT_EQ_WAIT(MediaSourceInterface::kLive, state_observer_->state(),
                  kMaxWaitMs);
   const cricket::VideoFormat* format = capturer_->GetCaptureFormat();
   ASSERT_TRUE(format != NULL);
   EXPECT_EQ(640, format->width);
   EXPECT_EQ(480, format->height);
   EXPECT_EQ(30, format->framerate());
 }
 
 // Tests that the source starts video with the max width and height set by
 // constraints for screencast.
 TEST_F(VideoSourceTest, ScreencastResolutionWithConstraint) {
   FakeConstraints constraints;
   constraints.AddMandatory(MediaConstraintsInterface::kMaxWidth, 480);
   constraints.AddMandatory(MediaConstraintsInterface::kMaxHeight, 270);
 
+  InitScreencast(true);
   capturer_->TestWithoutCameraFormats();
-  capturer_->SetScreencast(true);
 
   CreateVideoSource(&constraints);
   EXPECT_EQ_WAIT(MediaSourceInterface::kLive, state_observer_->state(),
                  kMaxWaitMs);
   const cricket::VideoFormat* format = capturer_->GetCaptureFormat();
   ASSERT_TRUE(format != NULL);
   EXPECT_EQ(480, format->width);
   EXPECT_EQ(270, format->height);
   EXPECT_EQ(30, format->framerate());
 }
@@ skipping 12 matching lines @@
   FakeConstraints constraints;
   constraints.AddOptional(MediaConstraintsInterface::kMaxFrameRate, 0.5);
 
   CreateVideoSource(&constraints);
   EXPECT_EQ_WAIT(MediaSourceInterface::kLive, state_observer_->state(),
                  kMaxWaitMs);
   const cricket::VideoFormat* format = capturer_->GetCaptureFormat();
   ASSERT_TRUE(format != NULL);
   EXPECT_EQ(30, format->framerate());
 }