| OLD | NEW |
| 1 /* | 1 /* |
| 2 * libjingle | 2 * libjingle |
| 3 * Copyright 2004 Google Inc. | 3 * Copyright 2004 Google Inc. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions are met: | 6 * modification, are permitted provided that the following conditions are met: |
| 7 * | 7 * |
| 8 * 1. Redistributions of source code must retain the above copyright notice, | 8 * 1. Redistributions of source code must retain the above copyright notice, |
| 9 * this list of conditions and the following disclaimer. | 9 * this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright notice, | 10 * 2. Redistributions in binary form must reproduce the above copyright notice, |
| (...skipping 1531 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1542 | 1542 |
| 1543 TEST_F(WebRtcVideoChannel2Test, DISABLED_SetBandwidthInConference) { | 1543 TEST_F(WebRtcVideoChannel2Test, DISABLED_SetBandwidthInConference) { |
| 1544 FAIL() << "Not implemented."; // TODO(pbos): Implement. | 1544 FAIL() << "Not implemented."; // TODO(pbos): Implement. |
| 1545 } | 1545 } |
| 1546 | 1546 |
| 1547 TEST_F(WebRtcVideoChannel2Test, UsesCorrectSettingsForScreencast) { | 1547 TEST_F(WebRtcVideoChannel2Test, UsesCorrectSettingsForScreencast) { |
| 1548 static const int kScreenshareMinBitrateKbps = 800; | 1548 static const int kScreenshareMinBitrateKbps = 800; |
| 1549 cricket::VideoCodec codec = kVp8Codec360p; | 1549 cricket::VideoCodec codec = kVp8Codec360p; |
| 1550 cricket::VideoSendParameters parameters; | 1550 cricket::VideoSendParameters parameters; |
| 1551 parameters.codecs.push_back(codec); | 1551 parameters.codecs.push_back(codec); |
| 1552 parameters.options.screencast_min_bitrate = | 1552 parameters.options.screencast_min_bitrate_kbps = |
| 1553 rtc::Optional<int>(kScreenshareMinBitrateKbps); | 1553 rtc::Optional<int>(kScreenshareMinBitrateKbps); |
| 1554 EXPECT_TRUE(channel_->SetSendParameters(parameters)); | 1554 EXPECT_TRUE(channel_->SetSendParameters(parameters)); |
| 1555 | 1555 |
| 1556 AddSendStream(); | 1556 AddSendStream(); |
| 1557 | 1557 |
| 1558 cricket::FakeVideoCapturer capturer; | 1558 cricket::FakeVideoCapturer capturer; |
| 1559 capturer.SetScreencast(false); | 1559 capturer.SetScreencast(false); |
| 1560 EXPECT_TRUE(channel_->SetCapturer(last_ssrc_, &capturer)); | 1560 EXPECT_TRUE(channel_->SetCapturer(last_ssrc_, &capturer)); |
| 1561 cricket::VideoFormat capture_format_hd = | 1561 cricket::VideoFormat capture_format_hd = |
| 1562 capturer.GetSupportedFormats()->front(); | 1562 capturer.GetSupportedFormats()->front(); |
| (...skipping 1834 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3397 // Ensures that the correct settings are applied to the codec when two temporal | 3397 // Ensures that the correct settings are applied to the codec when two temporal |
| 3398 // layer screencasting is enabled, and that the correct simulcast settings are | 3398 // layer screencasting is enabled, and that the correct simulcast settings are |
| 3399 // reapplied when disabling screencasting. | 3399 // reapplied when disabling screencasting. |
| 3400 TEST_F(WebRtcVideoChannel2SimulcastTest, | 3400 TEST_F(WebRtcVideoChannel2SimulcastTest, |
| 3401 DISABLED_TwoTemporalLayerScreencastSettings) { | 3401 DISABLED_TwoTemporalLayerScreencastSettings) { |
| 3402 // TODO(pbos): Implement. | 3402 // TODO(pbos): Implement. |
| 3403 FAIL() << "Not implemented."; | 3403 FAIL() << "Not implemented."; |
| 3404 } | 3404 } |
| 3405 | 3405 |
| 3406 } // namespace cricket | 3406 } // namespace cricket |
| OLD | NEW |