Index: webrtc/media/engine/webrtcvoiceengine_unittest.cc |
diff --git a/webrtc/media/engine/webrtcvoiceengine_unittest.cc b/webrtc/media/engine/webrtcvoiceengine_unittest.cc |
index 768673d73d2e0b44275f9a5bbcbb8ce5fe3249ec..5248e4bb9130bb0755a7ea1032ea0805ffe6c7c3 100644 |
--- a/webrtc/media/engine/webrtcvoiceengine_unittest.cc |
+++ b/webrtc/media/engine/webrtcvoiceengine_unittest.cc |
@@ -63,6 +63,8 @@ class FakeAudioSink : public webrtc::AudioSinkInterface { |
void OnData(const Data& audio) override {} |
}; |
+class FakeAudioSource : public cricket::AudioSource {}; |
+ |
class WebRtcVoiceEngineTestFake : public testing::Test { |
public: |
WebRtcVoiceEngineTestFake() : WebRtcVoiceEngineTestFake("") {} |
@@ -71,6 +73,7 @@ class WebRtcVoiceEngineTestFake : public testing::Test { |
: call_(webrtc::Call::Config()), |
engine_(new FakeVoEWrapper(&voe_)), |
channel_(nullptr), |
+ fake_source_(new FakeAudioSource()), |
override_field_trials_(field_trials) { |
send_parameters_.codecs.push_back(kPcmuCodec); |
recv_parameters_.codecs.push_back(kPcmuCodec); |
@@ -94,8 +97,10 @@ class WebRtcVoiceEngineTestFake : public testing::Test { |
if (!SetupEngine()) { |
return false; |
} |
- return channel_->AddSendStream( |
- cricket::StreamParams::CreateLegacy(kSsrc1)); |
+ if (!channel_->AddSendStream(cricket::StreamParams::CreateLegacy(kSsrc1))) { |
+ return false; |
+ } |
+ return channel_->SetAudioSend(kSsrc1, true, nullptr, fake_source_.get()); |
} |
void SetupForMultiSendStream() { |
EXPECT_TRUE(SetupEngineWithSendStream()); |
@@ -401,6 +406,7 @@ class WebRtcVoiceEngineTestFake : public testing::Test { |
cricket::VoiceMediaChannel* channel_; |
cricket::AudioSendParameters send_parameters_; |
cricket::AudioRecvParameters recv_parameters_; |
+ rtc::scoped_ptr<FakeAudioSource> fake_source_; |
the sun
2016/03/03 15:15:25
No need for a scoped_ptr/unique_ptr here.
|
private: |
webrtc::test::ScopedFieldTrials override_field_trials_; |
@@ -2030,6 +2036,8 @@ TEST_F(WebRtcVoiceEngineTestFake, CreateAndDeleteMultipleSendStreams) { |
for (uint32_t ssrc : kSsrcs4) { |
EXPECT_TRUE(channel_->AddSendStream( |
cricket::StreamParams::CreateLegacy(ssrc))); |
+ EXPECT_TRUE( |
+ channel_->SetAudioSend(ssrc, true, nullptr, fake_source_.get())); |
// Verify that we are in a sending state for all the created streams. |
EXPECT_TRUE(voe_.GetSend(GetSendStreamConfig(ssrc).voe_channel_id)); |
} |
@@ -2090,6 +2098,8 @@ TEST_F(WebRtcVoiceEngineTestFake, SetSendWithMultipleSendStreams) { |
for (uint32_t ssrc : kSsrcs4) { |
EXPECT_TRUE(channel_->AddSendStream( |
cricket::StreamParams::CreateLegacy(ssrc))); |
+ EXPECT_TRUE( |
+ channel_->SetAudioSend(ssrc, true, nullptr, fake_source_.get())); |
int channel_num = voe_.GetLastChannel(); |
EXPECT_FALSE(voe_.GetSend(channel_num)); |
} |