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

Side by Side Diff: webrtc/media/engine/webrtcvoiceengine_unittest.cc

Issue 2642923003: Removed double-special-casing of ISAC in libjingle and WebRtcVoE. (Closed)
Patch Set: Rebase Created 3 years, 11 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 | « webrtc/media/engine/webrtcvoiceengine.cc ('k') | webrtc/pc/webrtcsdp.cc » ('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 (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 1870 matching lines...) Expand 10 before | Expand all | Expand 10 after
1881 EXPECT_STREQ("ISAC", gcodec.plname); 1881 EXPECT_STREQ("ISAC", gcodec.plname);
1882 EXPECT_EQ(32000, gcodec.rate); 1882 EXPECT_EQ(32000, gcodec.rate);
1883 } 1883 }
1884 1884
1885 parameters.codecs[0].bitrate = 0; // bitrate == default 1885 parameters.codecs[0].bitrate = 0; // bitrate == default
1886 SetSendParameters(parameters); 1886 SetSendParameters(parameters);
1887 { 1887 {
1888 const auto& gcodec = GetSendStreamConfig(kSsrc1).send_codec_spec.codec_inst; 1888 const auto& gcodec = GetSendStreamConfig(kSsrc1).send_codec_spec.codec_inst;
1889 EXPECT_EQ(103, gcodec.pltype); 1889 EXPECT_EQ(103, gcodec.pltype);
1890 EXPECT_STREQ("ISAC", gcodec.plname); 1890 EXPECT_STREQ("ISAC", gcodec.plname);
1891 EXPECT_EQ(-1, gcodec.rate); 1891 EXPECT_EQ(32000, gcodec.rate);
1892 } 1892 }
1893 parameters.codecs[0].bitrate = 28000; // bitrate == 28000 1893 parameters.codecs[0].bitrate = 28000; // bitrate == 28000
1894 SetSendParameters(parameters); 1894 SetSendParameters(parameters);
1895 { 1895 {
1896 const auto& gcodec = GetSendStreamConfig(kSsrc1).send_codec_spec.codec_inst; 1896 const auto& gcodec = GetSendStreamConfig(kSsrc1).send_codec_spec.codec_inst;
1897 EXPECT_EQ(103, gcodec.pltype); 1897 EXPECT_EQ(103, gcodec.pltype);
1898 EXPECT_STREQ("ISAC", gcodec.plname); 1898 EXPECT_STREQ("ISAC", gcodec.plname);
1899 EXPECT_EQ(28000, gcodec.rate); 1899 EXPECT_EQ(28000, gcodec.rate);
1900 } 1900 }
1901 1901
(...skipping 1772 matching lines...) Expand 10 before | Expand all | Expand 10 after
3674 nullptr, webrtc::CreateBuiltinAudioDecoderFactory(), nullptr); 3674 nullptr, webrtc::CreateBuiltinAudioDecoderFactory(), nullptr);
3675 webrtc::RtcEventLogNullImpl event_log; 3675 webrtc::RtcEventLogNullImpl event_log;
3676 std::unique_ptr<webrtc::Call> call( 3676 std::unique_ptr<webrtc::Call> call(
3677 webrtc::Call::Create(webrtc::Call::Config(&event_log))); 3677 webrtc::Call::Create(webrtc::Call::Config(&event_log)));
3678 cricket::WebRtcVoiceMediaChannel channel(&engine, cricket::MediaConfig(), 3678 cricket::WebRtcVoiceMediaChannel channel(&engine, cricket::MediaConfig(),
3679 cricket::AudioOptions(), call.get()); 3679 cricket::AudioOptions(), call.get());
3680 cricket::AudioRecvParameters parameters; 3680 cricket::AudioRecvParameters parameters;
3681 parameters.codecs = engine.recv_codecs(); 3681 parameters.codecs = engine.recv_codecs();
3682 EXPECT_TRUE(channel.SetRecvParameters(parameters)); 3682 EXPECT_TRUE(channel.SetRecvParameters(parameters));
3683 } 3683 }
OLDNEW
« no previous file with comments | « webrtc/media/engine/webrtcvoiceengine.cc ('k') | webrtc/pc/webrtcsdp.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698