Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (c) 2008 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2008 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 3592 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3603 } else if (it->name == "G722" && it->clockrate == 8000) { | 3603 } else if (it->name == "G722" && it->clockrate == 8000) { |
| 3604 EXPECT_EQ(9, it->id); | 3604 EXPECT_EQ(9, it->id); |
| 3605 } else if (it->name == "telephone-event") { | 3605 } else if (it->name == "telephone-event") { |
| 3606 EXPECT_EQ(126, it->id); | 3606 EXPECT_EQ(126, it->id); |
| 3607 } else if (it->name == "red") { | 3607 } else if (it->name == "red") { |
| 3608 EXPECT_EQ(127, it->id); | 3608 EXPECT_EQ(127, it->id); |
| 3609 } else if (it->name == "opus") { | 3609 } else if (it->name == "opus") { |
| 3610 EXPECT_EQ(111, it->id); | 3610 EXPECT_EQ(111, it->id); |
| 3611 ASSERT_TRUE(it->params.find("minptime") != it->params.end()); | 3611 ASSERT_TRUE(it->params.find("minptime") != it->params.end()); |
| 3612 EXPECT_EQ("10", it->params.find("minptime")->second); | 3612 EXPECT_EQ("10", it->params.find("minptime")->second); |
| 3613 ASSERT_TRUE(it->params.find("maxptime") != it->params.end()); | |
| 3614 EXPECT_EQ("60", it->params.find("maxptime")->second); | |
|
the sun
2016/05/10 13:20:57
Did you mean update the unit test by removing? Is
| |
| 3615 ASSERT_TRUE(it->params.find("useinbandfec") != it->params.end()); | 3613 ASSERT_TRUE(it->params.find("useinbandfec") != it->params.end()); |
| 3616 EXPECT_EQ("1", it->params.find("useinbandfec")->second); | 3614 EXPECT_EQ("1", it->params.find("useinbandfec")->second); |
| 3617 } | 3615 } |
| 3618 } | 3616 } |
| 3619 } | 3617 } |
| 3620 | 3618 |
| 3621 // Tests that VoE supports at least 32 channels | 3619 // Tests that VoE supports at least 32 channels |
| 3622 TEST(WebRtcVoiceEngineTest, Has32Channels) { | 3620 TEST(WebRtcVoiceEngineTest, Has32Channels) { |
| 3623 cricket::WebRtcVoiceEngine engine(nullptr); | 3621 cricket::WebRtcVoiceEngine engine(nullptr); |
| 3624 std::unique_ptr<webrtc::Call> call( | 3622 std::unique_ptr<webrtc::Call> call( |
| (...skipping 21 matching lines...) Expand all Loading... | |
| 3646 TEST(WebRtcVoiceEngineTest, SetRecvCodecs) { | 3644 TEST(WebRtcVoiceEngineTest, SetRecvCodecs) { |
| 3647 cricket::WebRtcVoiceEngine engine(nullptr); | 3645 cricket::WebRtcVoiceEngine engine(nullptr); |
| 3648 std::unique_ptr<webrtc::Call> call( | 3646 std::unique_ptr<webrtc::Call> call( |
| 3649 webrtc::Call::Create(webrtc::Call::Config())); | 3647 webrtc::Call::Create(webrtc::Call::Config())); |
| 3650 cricket::WebRtcVoiceMediaChannel channel(&engine, cricket::MediaConfig(), | 3648 cricket::WebRtcVoiceMediaChannel channel(&engine, cricket::MediaConfig(), |
| 3651 cricket::AudioOptions(), call.get()); | 3649 cricket::AudioOptions(), call.get()); |
| 3652 cricket::AudioRecvParameters parameters; | 3650 cricket::AudioRecvParameters parameters; |
| 3653 parameters.codecs = engine.codecs(); | 3651 parameters.codecs = engine.codecs(); |
| 3654 EXPECT_TRUE(channel.SetRecvParameters(parameters)); | 3652 EXPECT_TRUE(channel.SetRecvParameters(parameters)); |
| 3655 } | 3653 } |
| OLD | NEW |