Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(277)

Side by Side Diff: webrtc/api/webrtcsession_unittest.cc

Issue 2013053002: Support for two audio codec lists down into WebRtcVoiceEngine. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@asymmetric-audio-codec-support
Patch Set: Replaced MergeSendRecvCodecs with NegotiateCodecs. Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | webrtc/media/base/fakemediaengine.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2012 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 1315 matching lines...) Expand 10 before | Expand all | Expand 10 after
1326 EXPECT_EQ_WAIT(fake_call_.last_sent_packet().packet_id, 10, kPacketTimeout); 1326 EXPECT_EQ_WAIT(fake_call_.last_sent_packet().packet_id, 10, kPacketTimeout);
1327 EXPECT_GT(fake_call_.last_sent_packet().send_time_ms, -1); 1327 EXPECT_GT(fake_call_.last_sent_packet().send_time_ms, -1);
1328 } 1328 }
1329 1329
1330 // Adds CN codecs to FakeMediaEngine and MediaDescriptionFactory. 1330 // Adds CN codecs to FakeMediaEngine and MediaDescriptionFactory.
1331 void AddCNCodecs() { 1331 void AddCNCodecs() {
1332 const cricket::AudioCodec kCNCodec1(102, "CN", 8000, 0, 1); 1332 const cricket::AudioCodec kCNCodec1(102, "CN", 8000, 0, 1);
1333 const cricket::AudioCodec kCNCodec2(103, "CN", 16000, 0, 1); 1333 const cricket::AudioCodec kCNCodec2(103, "CN", 16000, 0, 1);
1334 1334
1335 // Add kCNCodec for dtmf test. 1335 // Add kCNCodec for dtmf test.
1336 std::vector<cricket::AudioCodec> codecs = media_engine_->audio_codecs();; 1336 std::vector<cricket::AudioCodec> codecs =
1337 media_engine_->audio_send_codecs();
1337 codecs.push_back(kCNCodec1); 1338 codecs.push_back(kCNCodec1);
1338 codecs.push_back(kCNCodec2); 1339 codecs.push_back(kCNCodec2);
1339 media_engine_->SetAudioCodecs(codecs); 1340 media_engine_->SetAudioCodecs(codecs);
1340 desc_factory_->set_audio_codecs(codecs, codecs); 1341 desc_factory_->set_audio_codecs(codecs, codecs);
1341 } 1342 }
1342 1343
1343 bool VerifyNoCNCodecs(const cricket::ContentInfo* content) { 1344 bool VerifyNoCNCodecs(const cricket::ContentInfo* content) {
1344 const cricket::ContentDescription* description = content->description; 1345 const cricket::ContentDescription* description = content->description;
1345 ASSERT(description != NULL); 1346 ASSERT(description != NULL);
1346 const cricket::AudioContentDescription* audio_content_desc = 1347 const cricket::AudioContentDescription* audio_content_desc =
(...skipping 3057 matching lines...) Expand 10 before | Expand all | Expand 10 after
4404 } 4405 }
4405 4406
4406 // TODO(bemasc): Add a TestIceStatesBundle with BUNDLE enabled. That test 4407 // TODO(bemasc): Add a TestIceStatesBundle with BUNDLE enabled. That test
4407 // currently fails because upon disconnection and reconnection OnIceComplete is 4408 // currently fails because upon disconnection and reconnection OnIceComplete is
4408 // called more than once without returning to IceGatheringGathering. 4409 // called more than once without returning to IceGatheringGathering.
4409 4410
4410 INSTANTIATE_TEST_CASE_P(WebRtcSessionTests, 4411 INSTANTIATE_TEST_CASE_P(WebRtcSessionTests,
4411 WebRtcSessionTest, 4412 WebRtcSessionTest,
4412 testing::Values(ALREADY_GENERATED, 4413 testing::Values(ALREADY_GENERATED,
4413 DTLS_IDENTITY_STORE)); 4414 DTLS_IDENTITY_STORE));
OLDNEW
« no previous file with comments | « no previous file | webrtc/media/base/fakemediaengine.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698