| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2004 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2004 The WebRTC project authors. All Rights Reserved. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
| 5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
| 6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
| 7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
| 8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
| 9 */ | 9 */ |
| 10 | 10 |
| (...skipping 2254 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2265 EXPECT_EQ(1, send_stream->GetNumberOfSwappedFrames()); | 2265 EXPECT_EQ(1, send_stream->GetNumberOfSwappedFrames()); |
| 2266 EXPECT_EQ(1284, send_stream->GetLastWidth()); | 2266 EXPECT_EQ(1284, send_stream->GetLastWidth()); |
| 2267 EXPECT_EQ(724, send_stream->GetLastHeight()); | 2267 EXPECT_EQ(724, send_stream->GetLastHeight()); |
| 2268 | 2268 |
| 2269 // Switch back to the normal capturer. Expect the frame to be CPU adapted. | 2269 // Switch back to the normal capturer. Expect the frame to be CPU adapted. |
| 2270 channel_->SetVideoSend(last_ssrc_, true /* enable */, &camera_options, | 2270 channel_->SetVideoSend(last_ssrc_, true /* enable */, &camera_options, |
| 2271 &capturer); | 2271 &capturer); |
| 2272 send_stream = fake_call_->GetVideoSendStreams().front(); | 2272 send_stream = fake_call_->GetVideoSendStreams().front(); |
| 2273 // We have a new fake send stream, so it doesn't remember the old sink wants. | 2273 // We have a new fake send stream, so it doesn't remember the old sink wants. |
| 2274 // In practice, it will be populated from | 2274 // In practice, it will be populated from |
| 2275 // ViEEncoder::VideoSourceProxy::SetSource(), so simulate that here. | 2275 // VideoStreamEncoder::VideoSourceProxy::SetSource(), so simulate that here. |
| 2276 send_stream->InjectVideoSinkWants(wants); | 2276 send_stream->InjectVideoSinkWants(wants); |
| 2277 EXPECT_TRUE(capturer.CaptureCustomFrame(1280, 720, cricket::FOURCC_I420)); | 2277 EXPECT_TRUE(capturer.CaptureCustomFrame(1280, 720, cricket::FOURCC_I420)); |
| 2278 ASSERT_EQ(3, fake_call_->GetNumCreatedSendStreams()); | 2278 ASSERT_EQ(3, fake_call_->GetNumCreatedSendStreams()); |
| 2279 send_stream = fake_call_->GetVideoSendStreams().front(); | 2279 send_stream = fake_call_->GetVideoSendStreams().front(); |
| 2280 EXPECT_EQ(1, send_stream->GetNumberOfSwappedFrames()); | 2280 EXPECT_EQ(1, send_stream->GetNumberOfSwappedFrames()); |
| 2281 EXPECT_EQ(1280 * 3 / 4, send_stream->GetLastWidth()); | 2281 EXPECT_EQ(1280 * 3 / 4, send_stream->GetLastWidth()); |
| 2282 EXPECT_EQ(720 * 3 / 4, send_stream->GetLastHeight()); | 2282 EXPECT_EQ(720 * 3 / 4, send_stream->GetLastHeight()); |
| 2283 | 2283 |
| 2284 EXPECT_TRUE(channel_->SetVideoSend(last_ssrc_, true, nullptr, nullptr)); | 2284 EXPECT_TRUE(channel_->SetVideoSend(last_ssrc_, true, nullptr, nullptr)); |
| 2285 } | 2285 } |
| (...skipping 2395 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4681 | 4681 |
| 4682 TEST_F(WebRtcVideoChannelSimulcastTest, | 4682 TEST_F(WebRtcVideoChannelSimulcastTest, |
| 4683 NoSimulcastScreenshareWithoutConference) { | 4683 NoSimulcastScreenshareWithoutConference) { |
| 4684 webrtc::test::ScopedFieldTrials override_field_trials_( | 4684 webrtc::test::ScopedFieldTrials override_field_trials_( |
| 4685 "WebRTC-SimulcastScreenshare/Enabled/"); | 4685 "WebRTC-SimulcastScreenshare/Enabled/"); |
| 4686 VerifySimulcastSettings(cricket::VideoCodec("VP8"), 1280, 720, 3, 1, true, | 4686 VerifySimulcastSettings(cricket::VideoCodec("VP8"), 1280, 720, 3, 1, true, |
| 4687 false); | 4687 false); |
| 4688 } | 4688 } |
| 4689 | 4689 |
| 4690 } // namespace cricket | 4690 } // namespace cricket |
| OLD | NEW |