zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add audio_ prefix to audio-related members of CallTest.

Browse Source 
Intend to soon add a video_encoder_factory_ member.

Bug: webrtc:8830
Change-Id: I17bfeb51023ed34b6ec0710c70ad2541f9f4933d
Reviewed-on: https://webrtc-review.googlesource.com/65083
Reviewed-by: Patrik Höglund <phoglund@webrtc.org>
Reviewed-by: Erik Språng <sprang@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22650}
This commit is contained in:
Niels Möller
2018-03-28 14:16:04 +02:00
committed by Commit Bot
parent 38c5d9345d
commit 2784a03af7
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
call/call_perf_tests.cc
View File

@ -243,7 +243,7 @@ void CallPerfTest::TestAudioVideoSync(FecMode fec,
audio_recv_config.rtp.remote_ssrc = kAudioSendSsrc; audio_recv_config.rtp.remote_ssrc = kAudioSendSsrc;
audio_recv_config.rtp.local_ssrc = kAudioRecvSsrc; audio_recv_config.rtp.local_ssrc = kAudioRecvSsrc;
audio_recv_config.sync_group = kSyncGroup; audio_recv_config.sync_group = kSyncGroup;
audio_recv_config.decoder_factory = decoder_factory_; audio_recv_config.decoder_factory = audio_decoder_factory_;
audio_recv_config.decoder_map = { audio_recv_config.decoder_map = {
{kAudioSendPayloadType, {"ISAC", 16000, 1}}}; {kAudioSendPayloadType, {"ISAC", 16000, 1}}};

8
test/call_test.cc
View File

@ -41,8 +41,8 @@ CallTest::CallTest()
num_video_streams_(1), num_video_streams_(1),
num_audio_streams_(0), num_audio_streams_(0),
num_flexfec_streams_(0), num_flexfec_streams_(0),
decoder_factory_(CreateBuiltinAudioDecoderFactory()), audio_decoder_factory_(CreateBuiltinAudioDecoderFactory()),
encoder_factory_(CreateBuiltinAudioEncoderFactory()), audio_encoder_factory_(CreateBuiltinAudioEncoderFactory()),
task_queue_("CallTestTaskQueue") {} task_queue_("CallTestTaskQueue") {}
CallTest::~CallTest() { CallTest::~CallTest() {
@ -220,7 +220,7 @@ void CallTest::CreateAudioAndFecSendConfigs(size_t num_audio_streams,
audio_send_config_.rtp.ssrc = kAudioSendSsrc; audio_send_config_.rtp.ssrc = kAudioSendSsrc;
audio_send_config_.send_codec_spec = AudioSendStream::Config::SendCodecSpec( audio_send_config_.send_codec_spec = AudioSendStream::Config::SendCodecSpec(
kAudioSendPayloadType, {"opus", 48000, 2, {{"stereo", "1"}}}); 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. // TODO(brandtr): Update this when we support multistream protection.
@ -278,7 +278,7 @@ void CallTest::CreateMatchingAudioAndFecConfigs(
audio_config.rtp.local_ssrc = kReceiverLocalAudioSsrc; audio_config.rtp.local_ssrc = kReceiverLocalAudioSsrc;
audio_config.rtcp_send_transport = rtcp_send_transport; audio_config.rtcp_send_transport = rtcp_send_transport;
audio_config.rtp.remote_ssrc = audio_send_config_.rtp.ssrc; 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_config.decoder_map = {{kAudioSendPayloadType, {"opus", 48000, 2}}};
audio_receive_configs_.push_back(audio_config); audio_receive_configs_.push_back(audio_config);
} }

4
test/call_test.h
View File

@ -143,8 +143,8 @@ class CallTest : public ::testing::Test {
size_t num_video_streams_; size_t num_video_streams_;
size_t num_audio_streams_; size_t num_audio_streams_;
size_t num_flexfec_streams_; size_t num_flexfec_streams_;
rtc::scoped_refptr<AudioDecoderFactory> decoder_factory_; rtc::scoped_refptr<AudioDecoderFactory> audio_decoder_factory_;
rtc::scoped_refptr<AudioEncoderFactory> encoder_factory_; rtc::scoped_refptr<AudioEncoderFactory> audio_encoder_factory_;
test::FakeVideoRenderer fake_renderer_; test::FakeVideoRenderer fake_renderer_;
SingleThreadedTaskQueueForTesting task_queue_; SingleThreadedTaskQueueForTesting task_queue_;

4
video/video_quality_test.cc
View File

@ -2071,7 +2071,7 @@ void VideoQualityTest::SetupAudio(Transport* transport,
{"OPUS", 48000, 2, {"OPUS", 48000, 2,
{{"usedtx", (params_.audio.dtx ? "1" : "0")}, {{"usedtx", (params_.audio.dtx ? "1" : "0")},
{"stereo", "1"}}}); {"stereo", "1"}}});
audio_send_config_.encoder_factory = encoder_factory_; audio_send_config_.encoder_factory = audio_encoder_factory_;
audio_send_stream_ = sender_call_->CreateAudioSendStream(audio_send_config_); audio_send_stream_ = sender_call_->CreateAudioSendStream(audio_send_config_);
AudioReceiveStream::Config audio_config; AudioReceiveStream::Config audio_config;
@ -2080,7 +2080,7 @@ void VideoQualityTest::SetupAudio(Transport* transport,
audio_config.rtp.remote_ssrc = audio_send_config_.rtp.ssrc; audio_config.rtp.remote_ssrc = audio_send_config_.rtp.ssrc;
audio_config.rtp.transport_cc = params_.call.send_side_bwe; audio_config.rtp.transport_cc = params_.call.send_side_bwe;
audio_config.rtp.extensions = audio_send_config_.rtp.extensions; audio_config.rtp.extensions = audio_send_config_.rtp.extensions;
audio_config.decoder_factory = decoder_factory_; audio_config.decoder_factory = audio_decoder_factory_;
audio_config.decoder_map = {{kAudioSendPayloadType, {"OPUS", 48000, 2}}}; audio_config.decoder_map = {{kAudioSendPayloadType, {"OPUS", 48000, 2}}};
if (params_.video[0].enabled && params_.audio.sync_video) if (params_.video[0].enabled && params_.audio.sync_video)
audio_config.sync_group = kSyncGroup; audio_config.sync_group = kSyncGroup;