| 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 888 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 899 StreamParams sp = cricket::StreamParams::CreateLegacy(kSsrc); | 899 StreamParams sp = cricket::StreamParams::CreateLegacy(kSsrc); |
| 900 sp.id = "FakeStreamParamsId"; | 900 sp.id = "FakeStreamParamsId"; |
| 901 EXPECT_TRUE(channel->AddRecvStream(sp)); | 901 EXPECT_TRUE(channel->AddRecvStream(sp)); |
| 902 EXPECT_EQ(1u, decoder_factory.decoders().size()); | 902 EXPECT_EQ(1u, decoder_factory.decoders().size()); |
| 903 | 903 |
| 904 std::vector<cricket::VideoDecoderParams> params = decoder_factory.params(); | 904 std::vector<cricket::VideoDecoderParams> params = decoder_factory.params(); |
| 905 ASSERT_EQ(1u, params.size()); | 905 ASSERT_EQ(1u, params.size()); |
| 906 EXPECT_EQ(sp.id, params[0].receive_stream_id); | 906 EXPECT_EQ(sp.id, params[0].receive_stream_id); |
| 907 } | 907 } |
| 908 | 908 |
| 909 TEST_F(WebRtcVideoEngine2Test, RecreatesEncoderOnContentTypeChange) { | 909 TEST_F(WebRtcVideoEngine2Test, DISABLED_RecreatesEncoderOnContentTypeChange) { |
| 910 cricket::FakeWebRtcVideoEncoderFactory encoder_factory; | 910 cricket::FakeWebRtcVideoEncoderFactory encoder_factory; |
| 911 encoder_factory.AddSupportedVideoCodecType("VP8"); | 911 encoder_factory.AddSupportedVideoCodecType("VP8"); |
| 912 std::unique_ptr<FakeCall> fake_call( | 912 std::unique_ptr<FakeCall> fake_call( |
| 913 new FakeCall(webrtc::Call::Config(&event_log_))); | 913 new FakeCall(webrtc::Call::Config(&event_log_))); |
| 914 std::unique_ptr<VideoMediaChannel> channel( | 914 std::unique_ptr<VideoMediaChannel> channel( |
| 915 SetUpForExternalEncoderFactory(&encoder_factory)); | 915 SetUpForExternalEncoderFactory(&encoder_factory)); |
| 916 ASSERT_TRUE( | 916 ASSERT_TRUE( |
| 917 channel->AddSendStream(cricket::StreamParams::CreateLegacy(kSsrc))); | 917 channel->AddSendStream(cricket::StreamParams::CreateLegacy(kSsrc))); |
| 918 cricket::VideoCodec codec = GetEngineCodec("VP8"); | 918 cricket::VideoCodec codec = GetEngineCodec("VP8"); |
| 919 cricket::VideoSendParameters parameters; | 919 cricket::VideoSendParameters parameters; |
| (...skipping 3446 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4366 } | 4366 } |
| 4367 | 4367 |
| 4368 TEST_F(WebRtcVideoChannel2SimulcastTest, SetSendCodecsForSimulcastScreenshare) { | 4368 TEST_F(WebRtcVideoChannel2SimulcastTest, SetSendCodecsForSimulcastScreenshare) { |
| 4369 webrtc::test::ScopedFieldTrials override_field_trials_( | 4369 webrtc::test::ScopedFieldTrials override_field_trials_( |
| 4370 "WebRTC-SimulcastScreenshare/Enabled/"); | 4370 "WebRTC-SimulcastScreenshare/Enabled/"); |
| 4371 VerifySimulcastSettings(cricket::VideoCodec("VP8"), 1280, 720, 3, 2, true, | 4371 VerifySimulcastSettings(cricket::VideoCodec("VP8"), 1280, 720, 3, 2, true, |
| 4372 true); | 4372 true); |
| 4373 } | 4373 } |
| 4374 | 4374 |
| 4375 } // namespace cricket | 4375 } // namespace cricket |
| OLD | NEW |