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

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

Issue 1486123002: Return a copy of the supported RTP header extensions instead of a reference. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: . Created 5 years 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
OLDNEW
1 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2008 Google Inc. 3 * Copyright 2008 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 3095 matching lines...) Expand 10 before | Expand all | Expand 10 after
3106 3106
3107 // Combined BWE should be set up, but with no configured extensions. 3107 // Combined BWE should be set up, but with no configured extensions.
3108 EXPECT_EQ(2, call_.GetAudioReceiveStreams().size()); 3108 EXPECT_EQ(2, call_.GetAudioReceiveStreams().size());
3109 for (uint32_t ssrc : ssrcs) { 3109 for (uint32_t ssrc : ssrcs) {
3110 const auto* s = call_.GetAudioReceiveStream(ssrc); 3110 const auto* s = call_.GetAudioReceiveStream(ssrc);
3111 EXPECT_NE(nullptr, s); 3111 EXPECT_NE(nullptr, s);
3112 EXPECT_EQ(0, s->GetConfig().rtp.extensions.size()); 3112 EXPECT_EQ(0, s->GetConfig().rtp.extensions.size());
3113 } 3113 }
3114 3114
3115 // Set up receive extensions. 3115 // Set up receive extensions.
3116 const auto& e_exts = engine_.rtp_header_extensions(); 3116 const auto& e_exts = engine_.SupportedRtpHeaderExtensions();
3117 cricket::AudioRecvParameters recv_parameters; 3117 cricket::AudioRecvParameters recv_parameters;
3118 recv_parameters.extensions = e_exts; 3118 recv_parameters.extensions = e_exts;
3119 channel_->SetRecvParameters(recv_parameters); 3119 channel_->SetRecvParameters(recv_parameters);
3120 EXPECT_EQ(2, call_.GetAudioReceiveStreams().size()); 3120 EXPECT_EQ(2, call_.GetAudioReceiveStreams().size());
3121 for (uint32_t ssrc : ssrcs) { 3121 for (uint32_t ssrc : ssrcs) {
3122 const auto* s = call_.GetAudioReceiveStream(ssrc); 3122 const auto* s = call_.GetAudioReceiveStream(ssrc);
3123 EXPECT_NE(nullptr, s); 3123 EXPECT_NE(nullptr, s);
3124 const auto& s_exts = s->GetConfig().rtp.extensions; 3124 const auto& s_exts = s->GetConfig().rtp.extensions;
3125 EXPECT_EQ(e_exts.size(), s_exts.size()); 3125 EXPECT_EQ(e_exts.size(), s_exts.size());
3126 for (const auto& e_ext : e_exts) { 3126 for (const auto& e_ext : e_exts) {
(...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after
3356 cricket::WebRtcVoiceEngine engine; 3356 cricket::WebRtcVoiceEngine engine;
3357 EXPECT_TRUE(engine.Init(rtc::Thread::Current())); 3357 EXPECT_TRUE(engine.Init(rtc::Thread::Current()));
3358 rtc::scoped_ptr<webrtc::Call> call( 3358 rtc::scoped_ptr<webrtc::Call> call(
3359 webrtc::Call::Create(webrtc::Call::Config())); 3359 webrtc::Call::Create(webrtc::Call::Config()));
3360 cricket::WebRtcVoiceMediaChannel channel(&engine, cricket::AudioOptions(), 3360 cricket::WebRtcVoiceMediaChannel channel(&engine, cricket::AudioOptions(),
3361 call.get()); 3361 call.get());
3362 cricket::AudioRecvParameters parameters; 3362 cricket::AudioRecvParameters parameters;
3363 parameters.codecs = engine.codecs(); 3363 parameters.codecs = engine.codecs();
3364 EXPECT_TRUE(channel.SetRecvParameters(parameters)); 3364 EXPECT_TRUE(channel.SetRecvParameters(parameters));
3365 } 3365 }
OLDNEW
« talk/media/base/mediaengine.h ('K') | « talk/media/webrtc/webrtcvoiceengine.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698