Add audio_ prefix to audio-related members of CallTest.
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}diff --git a/call/call_perf_tests.cc b/call/call_perf_tests.cc
index 4e3a31a..703e5eb 100644
--- a/call/call_perf_tests.cc
+++ b/call/call_perf_tests.cc
@@ -243,7 +243,7 @@
audio_recv_config.rtp.remote_ssrc = kAudioSendSsrc;
audio_recv_config.rtp.local_ssrc = kAudioRecvSsrc;
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 = {
{kAudioSendPayloadType, {"ISAC", 16000, 1}}};
diff --git a/test/call_test.cc b/test/call_test.cc
index 57605de..38661ca 100644
--- a/test/call_test.cc
+++ b/test/call_test.cc
@@ -41,8 +41,8 @@
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") {}
CallTest::~CallTest() {
@@ -220,7 +220,7 @@
audio_send_config_.rtp.ssrc = kAudioSendSsrc;
audio_send_config_.send_codec_spec = 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.
@@ -278,7 +278,7 @@
audio_config.rtp.local_ssrc = kReceiverLocalAudioSsrc;
audio_config.rtcp_send_transport = rtcp_send_transport;
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);
}
diff --git a/test/call_test.h b/test/call_test.h
index aa0d5fd..c096b0d 100644
--- a/test/call_test.h
+++ b/test/call_test.h
@@ -143,8 +143,8 @@
size_t num_video_streams_;
size_t num_audio_streams_;
size_t num_flexfec_streams_;
- rtc::scoped_refptr<AudioDecoderFactory> decoder_factory_;
- rtc::scoped_refptr<AudioEncoderFactory> encoder_factory_;
+ rtc::scoped_refptr<AudioDecoderFactory> audio_decoder_factory_;
+ rtc::scoped_refptr<AudioEncoderFactory> audio_encoder_factory_;
test::FakeVideoRenderer fake_renderer_;
SingleThreadedTaskQueueForTesting task_queue_;
diff --git a/video/video_quality_test.cc b/video/video_quality_test.cc
index 79f29a9..6107266 100644
--- a/video/video_quality_test.cc
+++ b/video/video_quality_test.cc
@@ -2071,7 +2071,7 @@
{"OPUS", 48000, 2,
{{"usedtx", (params_.audio.dtx ? "1" : "0")},
{"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_);
AudioReceiveStream::Config audio_config;
@@ -2080,7 +2080,7 @@
audio_config.rtp.remote_ssrc = audio_send_config_.rtp.ssrc;
audio_config.rtp.transport_cc = params_.call.send_side_bwe;
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}}};
if (params_.video[0].enabled && params_.audio.sync_video)
audio_config.sync_group = kSyncGroup;