New flag is_screencast in VideoOptions.

webrtc/media/engine/webrtcvideoengine2_unittest.cc

Index: webrtc/media/engine/webrtcvideoengine2_unittest.cc
diff --git a/webrtc/media/engine/webrtcvideoengine2_unittest.cc b/webrtc/media/engine/webrtcvideoengine2_unittest.cc
index 70ddad2b6518da3fbcffd8b39705f1ee8f28e8f3..3460f76b941dbaf759265b7a18663c8258a385da 100644
--- a/webrtc/media/engine/webrtcvideoengine2_unittest.cc
+++ b/webrtc/media/engine/webrtcvideoengine2_unittest.cc
@@ -1465,7 +1465,6 @@ TEST_F(WebRtcVideoChannel2Test, UsesCorrectSettingsForScreencast) {
   AddSendStream();
 
   cricket::FakeVideoCapturer capturer;
-  capturer.SetScreencast(false);
   EXPECT_TRUE(channel_->SetCapturer(last_ssrc_, &capturer));
   cricket::VideoFormat capture_format_hd =
       capturer.GetSupportedFormats()->front();
@@ -1490,10 +1489,19 @@ TEST_F(WebRtcVideoChannel2Test, UsesCorrectSettingsForScreencast) {
   EXPECT_EQ(0, encoder_config.min_transmit_bitrate_bps)
       << "Non-screenshare shouldn't use min-transmit bitrate.";
 
-  capturer.SetScreencast(true);
-  EXPECT_TRUE(capturer.CaptureFrame());
+  FakeVideoCapturer screencast_capturer(true);
+  EXPECT_TRUE(channel_->SetCapturer(last_ssrc_, &screencast_capturer));
+  EXPECT_EQ(cricket::CS_RUNNING, screencast_capturer.Start(capture_format_hd));
+  parameters.options.is_screencast = rtc::Optional<bool>(true);
+  EXPECT_TRUE(channel_->SetSendParameters(parameters));
 
-  EXPECT_EQ(2, send_stream->GetNumberOfSwappedFrames());
+  // Send stream recreated after parameter change.
+  send_stream = fake_call_->GetVideoSendStreams().front();
+  EXPECT_EQ(0, send_stream->GetNumberOfSwappedFrames());
+
+  EXPECT_TRUE(screencast_capturer.CaptureFrame());
+
+  EXPECT_EQ(1, send_stream->GetNumberOfSwappedFrames());
 
   // Verify screencast settings.
   encoder_config = send_stream->GetEncoderConfig();
@@ -1514,12 +1522,12 @@ TEST_F(WebRtcVideoChannel2Test,
   static const int kConferenceScreencastTemporalBitrateBps =
       ScreenshareLayerConfig::GetDefault().tl0_bitrate_kbps * 1000;
   send_parameters_.conference_mode = true;
+  send_parameters_.options.is_screencast = rtc::Optional<bool>(true);
   channel_->SetSendParameters(send_parameters_);
 
   AddSendStream();
 
-  cricket::FakeVideoCapturer capturer;
-  capturer.SetScreencast(true);
+  cricket::FakeVideoCapturer capturer(true);
   EXPECT_TRUE(channel_->SetCapturer(last_ssrc_, &capturer));
   cricket::VideoFormat capture_format_hd =
       capturer.GetSupportedFormats()->front();
@@ -1583,8 +1591,7 @@ TEST_F(WebRtcVideoChannel2Test, VerifyVp8SpecificSettings) {
   // both RTX and regular SSRCs).
   FakeVideoSendStream* stream = SetUpSimulcast(false, true);
 
-  cricket::FakeVideoCapturer capturer;
-  capturer.SetScreencast(false);
+  cricket::FakeVideoCapturer capturer(false);
   EXPECT_EQ(cricket::CS_RUNNING,
             capturer.Start(capturer.GetSupportedFormats()->front()));
   EXPECT_TRUE(channel_->SetCapturer(last_ssrc_, &capturer));
@@ -1624,8 +1631,14 @@ TEST_F(WebRtcVideoChannel2Test, VerifyVp8SpecificSettings) {
   EXPECT_TRUE(vp8_settings.frameDroppingOn);
 
   // In screen-share mode, denoising is forced off and simulcast disabled.
-  capturer.SetScreencast(true);
-  EXPECT_TRUE(capturer.CaptureFrame());
+  FakeVideoCapturer screencast_capturer(true);
+  EXPECT_TRUE(channel_->SetCapturer(last_ssrc_, &screencast_capturer));
+  EXPECT_EQ(cricket::CS_RUNNING, screencast_capturer.Start(
+      screencast_capturer.GetSupportedFormats()->front()));
+  parameters.options.is_screencast = rtc::Optional<bool>(true);
+  EXPECT_TRUE(channel_->SetSendParameters(parameters));
+
+  EXPECT_TRUE(screencast_capturer.CaptureFrame());
   stream = SetDenoisingOption(parameters, false);
 
   EXPECT_EQ(1, stream->GetVideoStreams().size());
@@ -1675,8 +1688,7 @@ TEST_F(Vp9SettingsTest, VerifyVp9SpecificSettings) {
 
   FakeVideoSendStream* stream = SetUpSimulcast(false, false);
 
-  cricket::FakeVideoCapturer capturer;
-  capturer.SetScreencast(false);
+  cricket::FakeVideoCapturer capturer(false);
   EXPECT_EQ(cricket::CS_RUNNING,
             capturer.Start(capturer.GetSupportedFormats()->front()));
   EXPECT_TRUE(channel_->SetCapturer(last_ssrc_, &capturer));
@@ -1703,8 +1715,14 @@ TEST_F(Vp9SettingsTest, VerifyVp9SpecificSettings) {
   EXPECT_TRUE(vp9_settings.frameDroppingOn);
 
   // In screen-share mode, denoising is forced off.
-  capturer.SetScreencast(true);
-  EXPECT_TRUE(capturer.CaptureFrame());
+  FakeVideoCapturer screencast_capturer(true);
+  EXPECT_TRUE(channel_->SetCapturer(last_ssrc_, &screencast_capturer));
+  EXPECT_EQ(cricket::CS_RUNNING, screencast_capturer.Start(
+      screencast_capturer.GetSupportedFormats()->front()));
+  parameters.options.is_screencast = rtc::Optional<bool>(true);
+  EXPECT_TRUE(channel_->SetSendParameters(parameters));
+
+  EXPECT_TRUE(screencast_capturer.CaptureFrame());
   stream = SetDenoisingOption(parameters, false);
 
   ASSERT_TRUE(stream->GetVp9Settings(&vp9_settings)) << "No VP9 config set.";
@@ -1750,8 +1768,7 @@ void WebRtcVideoChannel2Test::TestCpuAdaptation(bool enable_overuse,
 
   AddSendStream();
 
-  cricket::FakeVideoCapturer capturer;
-  capturer.SetScreencast(is_screenshare);
+  cricket::FakeVideoCapturer capturer(is_screenshare);
   EXPECT_TRUE(channel_->SetCapturer(last_ssrc_, &capturer));
   EXPECT_EQ(cricket::CS_RUNNING,
             capturer.Start(capturer.GetSupportedFormats()->front()));