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

Unified Diff: webrtc/test/call_test.cc

Issue 3005253002: Add full stack tests for MediaCodec. (Closed)
Patch Set: Created 3 years, 3 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 side-by-side diff with in-line comments
Download patch
Index: webrtc/test/call_test.cc
diff --git a/webrtc/test/call_test.cc b/webrtc/test/call_test.cc
index b5d7236a65181350001d518ddb7ae8b8b0c538ff..ce94484ad467ab2f2a0f1ac46ebdc5aedda041ea 100644
--- a/webrtc/test/call_test.cc
+++ b/webrtc/test/call_test.cc
@@ -42,8 +42,8 @@ CallTest::CallTest()
num_video_streams_(1),
num_audio_streams_(0),
num_flexfec_streams_(0),
- decoder_factory_(CreateBuiltinAudioDecoderFactory()),
- encoder_factory_(CreateBuiltinAudioEncoderFactory()),
+ audio_decoder_factory_(CreateBuiltinAudioDecoderFactory()),
+ audio_encoder_factory_(CreateBuiltinAudioEncoderFactory()),
task_queue_("CallTestTaskQueue"),
fake_send_audio_device_(nullptr),
fake_recv_audio_device_(nullptr) {}
@@ -224,7 +224,7 @@ void CallTest::CreateSendConfig(size_t num_video_streams,
audio_send_config_.send_codec_spec =
rtc::Optional<AudioSendStream::Config::SendCodecSpec>(
{kAudioSendPayloadType, {"OPUS", 48000, 2, {{"stereo", "1"}}}});
- audio_send_config_.encoder_factory = encoder_factory_;
+ audio_send_config_.encoder_factory = audio_encoder_factory_;
}
// TODO(brandtr): Update this when we support multistream protection.
@@ -267,7 +267,7 @@ void CallTest::CreateMatchingReceiveConfigs(Transport* rtcp_send_transport) {
audio_config.rtcp_send_transport = rtcp_send_transport;
audio_config.voe_channel_id = voe_recv_.channel_id;
audio_config.rtp.remote_ssrc = audio_send_config_.rtp.ssrc;
- audio_config.decoder_factory = decoder_factory_;
+ audio_config.decoder_factory = audio_decoder_factory_;
audio_config.decoder_map = {{kAudioSendPayloadType, {"opus", 48000, 2}}};
audio_receive_configs_.push_back(audio_config);
}
@@ -426,8 +426,9 @@ void CallTest::SetFakeVideoCaptureRotation(VideoRotation rotation) {
void CallTest::CreateVoiceEngines() {
voe_send_.voice_engine = VoiceEngine::Create();
voe_send_.base = VoEBase::GetInterface(voe_send_.voice_engine);
- EXPECT_EQ(0, voe_send_.base->Init(fake_send_audio_device_.get(),
- apm_send_.get(), decoder_factory_));
+ EXPECT_EQ(0,
+ voe_send_.base->Init(fake_send_audio_device_.get(), apm_send_.get(),
+ audio_decoder_factory_.get()));
åsapersson 2017/09/11 09:28:44 audio_decoder_factory_?
brandtr 2017/09/13 11:17:23 Done. Not sure why I added this?
VoEBase::ChannelConfig config;
config.enable_voice_pacing = true;
voe_send_.channel_id = voe_send_.base->CreateChannel(config);
@@ -435,8 +436,9 @@ void CallTest::CreateVoiceEngines() {
voe_recv_.voice_engine = VoiceEngine::Create();
voe_recv_.base = VoEBase::GetInterface(voe_recv_.voice_engine);
- EXPECT_EQ(0, voe_recv_.base->Init(fake_recv_audio_device_.get(),
- apm_recv_.get(), decoder_factory_));
+ EXPECT_EQ(0,
+ voe_recv_.base->Init(fake_recv_audio_device_.get(), apm_recv_.get(),
+ audio_decoder_factory_.get()));
åsapersson 2017/09/11 09:28:44 same here
brandtr 2017/09/13 11:17:23 Done.
voe_recv_.channel_id = voe_recv_.base->CreateChannel();
EXPECT_GE(voe_recv_.channel_id, 0);
}

Powered by Google App Engine
This is Rietveld 408576698