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

Separate test/fake_audio_device on API and implementation. Step 2.

Browse Source 
Switch WebRTC internal usage of FakeAudioDevice on TestAudioDeviceModule.

Bug: webrtc:8946
Change-Id: I96b8b5d3b475d2197662e9007f836bd71f8ed04d
Reviewed-on: https://webrtc-review.googlesource.com/60521
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Commit-Queue: Artem Titov <titovartem@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22388}
This commit is contained in:
Artem Titov
2018-03-07 14:44:00 +01:00
committed by Commit Bot
parent 19704ec698
commit 3faa832247
12 changed files with 60 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
audio/BUILD.gn
View File

@ -99,7 +99,6 @@ if (rtc_include_tests) {
deps = [
":audio",
"../system_wrappers:system_wrappers",
"../test:fake_audio_device",
"../test:test_common",
"../test:test_support",
]
@ -180,7 +179,6 @@ if (rtc_include_tests) {
"../common_audio",
"../rtc_base:rtc_base_approved",
"../system_wrappers",
"../test:fake_audio_device",
"../test:test_common",
"../test:test_main",
"//testing/gtest",
@ -231,7 +229,6 @@ if (rtc_include_tests) {
"../common_audio",
"../rtc_base:rtc_base_approved",
"../system_wrappers",
"../test:fake_audio_device",
"../test:field_trial",
"../test:single_threaded_task_queue",
"../test:test_common",

8
audio/test/audio_bwe_integration_test.cc
View File

@ -37,14 +37,14 @@ size_t AudioBweTest::GetNumFlexfecStreams() const {
return 0;
}
std::unique_ptr<test::FakeAudioDevice::Capturer>
std::unique_ptr<TestAudioDeviceModule::Capturer>
AudioBweTest::CreateCapturer() {
return test::FakeAudioDevice::CreateWavFileReader(AudioInputFile());
return TestAudioDeviceModule::CreateWavFileReader(AudioInputFile());
}
void AudioBweTest::OnFakeAudioDevicesCreated(
test::FakeAudioDevice* send_audio_device,
test::FakeAudioDevice* recv_audio_device) {
TestAudioDeviceModule* send_audio_device,
TestAudioDeviceModule* recv_audio_device) {
send_audio_device_ = send_audio_device;
}

9
audio/test/audio_bwe_integration_test.h
View File

@ -14,7 +14,6 @@
#include <string>
#include "test/call_test.h"
#include "test/fake_audio_device.h"
#include "test/single_threaded_task_queue.h"
namespace webrtc {
@ -33,11 +32,11 @@ class AudioBweTest : public test::EndToEndTest {
size_t GetNumAudioStreams() const override;
size_t GetNumFlexfecStreams() const override;
std::unique_ptr<test::FakeAudioDevice::Capturer> CreateCapturer() override;
std::unique_ptr<TestAudioDeviceModule::Capturer> CreateCapturer() override;
void OnFakeAudioDevicesCreated(
test::FakeAudioDevice* send_audio_device,
test::FakeAudioDevice* recv_audio_device) override;
TestAudioDeviceModule* send_audio_device,
TestAudioDeviceModule* recv_audio_device) override;
test::PacketTransport* CreateSendTransport(
SingleThreadedTaskQueueForTesting* task_queue,
@ -48,7 +47,7 @@ class AudioBweTest : public test::EndToEndTest {
void PerformTest() override;
private:
test::FakeAudioDevice* send_audio_device_;
TestAudioDeviceModule* send_audio_device_;
};
} // namespace test

17
audio/test/audio_end_to_end_test.cc
View File

@ -12,7 +12,6 @@
#include "audio/test/audio_end_to_end_test.h"
#include "system_wrappers/include/sleep.h"
#include "test/fake_audio_device.h"
#include "test/gtest.h"
namespace webrtc {
@ -43,19 +42,19 @@ size_t AudioEndToEndTest::GetNumFlexfecStreams() const {
return 0;
}
std::unique_ptr<test::FakeAudioDevice::Capturer>
AudioEndToEndTest::CreateCapturer() {
return test::FakeAudioDevice::CreatePulsedNoiseCapturer(32000, kSampleRate);
std::unique_ptr<TestAudioDeviceModule::Capturer>
AudioEndToEndTest::CreateCapturer() {
return TestAudioDeviceModule::CreatePulsedNoiseCapturer(32000, kSampleRate);
}
std::unique_ptr<test::FakeAudioDevice::Renderer>
AudioEndToEndTest::CreateRenderer() {
return test::FakeAudioDevice::CreateDiscardRenderer(kSampleRate);
std::unique_ptr<TestAudioDeviceModule::Renderer>
AudioEndToEndTest::CreateRenderer() {
return TestAudioDeviceModule::CreateDiscardRenderer(kSampleRate);
}
void AudioEndToEndTest::OnFakeAudioDevicesCreated(
test::FakeAudioDevice* send_audio_device,
test::FakeAudioDevice* recv_audio_device) {
TestAudioDeviceModule* send_audio_device,
TestAudioDeviceModule* recv_audio_device) {
send_audio_device_ = send_audio_device;
}

12
audio/test/audio_end_to_end_test.h
View File

@ -24,7 +24,7 @@ class AudioEndToEndTest : public test::EndToEndTest {
AudioEndToEndTest();
protected:
test::FakeAudioDevice* send_audio_device() { return send_audio_device_; }
TestAudioDeviceModule* send_audio_device() { return send_audio_device_; }
const AudioSendStream* send_stream() const { return send_stream_; }
const AudioReceiveStream* receive_stream() const { return receive_stream_; }
@ -34,12 +34,12 @@ class AudioEndToEndTest : public test::EndToEndTest {
size_t GetNumAudioStreams() const override;
size_t GetNumFlexfecStreams() const override;
std::unique_ptr<test::FakeAudioDevice::Capturer> CreateCapturer() override;
std::unique_ptr<test::FakeAudioDevice::Renderer> CreateRenderer() override;
std::unique_ptr<TestAudioDeviceModule::Capturer> CreateCapturer() override;
std::unique_ptr<TestAudioDeviceModule::Renderer> CreateRenderer() override;
void OnFakeAudioDevicesCreated(
test::FakeAudioDevice* send_audio_device,
test::FakeAudioDevice* recv_audio_device) override;
TestAudioDeviceModule* send_audio_device,
TestAudioDeviceModule* recv_audio_device) override;
test::PacketTransport* CreateSendTransport(
SingleThreadedTaskQueueForTesting* task_queue,
@ -57,7 +57,7 @@ class AudioEndToEndTest : public test::EndToEndTest {
void PerformTest() override;
private:
test::FakeAudioDevice* send_audio_device_ = nullptr;
TestAudioDeviceModule* send_audio_device_ = nullptr;
AudioSendStream* send_stream_ = nullptr;
AudioReceiveStream* receive_stream_ = nullptr;
};

8
audio/test/low_bandwidth_audio_test.cc
View File

@ -45,12 +45,12 @@ class AudioQualityTest : public AudioEndToEndTest {
"_" + FileSampleRateSuffix() + ".wav";
}
std::unique_ptr<test::FakeAudioDevice::Capturer> CreateCapturer() override {
return test::FakeAudioDevice::CreateWavFileReader(AudioInputFile());
std::unique_ptr<TestAudioDeviceModule::Capturer> CreateCapturer() override {
return TestAudioDeviceModule::CreateWavFileReader(AudioInputFile());
}
std::unique_ptr<test::FakeAudioDevice::Renderer> CreateRenderer() override {
return test::FakeAudioDevice::CreateBoundedWavFileWriter(
std::unique_ptr<TestAudioDeviceModule::Renderer> CreateRenderer() override {
return TestAudioDeviceModule::CreateBoundedWavFileWriter(
AudioOutputFile(), FLAG_sample_rate_hz);
}

2
call/BUILD.gn
View File

@ -286,6 +286,7 @@ if (rtc_include_tests) {
"../api/audio_codecs:builtin_audio_encoder_factory",
"../logging:rtc_event_log_api",
"../modules/audio_coding",
"../modules/audio_device",
"../modules/audio_mixer:audio_mixer_impl",
"../modules/rtp_rtcp",
"../rtc_base:checks",
@ -294,7 +295,6 @@ if (rtc_include_tests) {
"../system_wrappers:metrics_default",
"../system_wrappers:runtime_enabled_features_default",
"../test:direct_transport",
"../test:fake_audio_device",
"../test:field_trial",
"../test:perf_test",
"../test:test_common",

12
call/call_perf_tests.cc
View File

@ -18,6 +18,7 @@
#include "call/video_config.h"
#include "logging/rtc_event_log/rtc_event_log.h"
#include "modules/audio_coding/include/audio_coding_module.h"
#include "modules/audio_device/include/test_audio_device.h"
#include "modules/audio_mixer/audio_mixer_impl.h"
#include "modules/rtp_rtcp/include/rtp_header_parser.h"
#include "rtc_base/bitrateallocationstrategy.h"
@ -29,7 +30,6 @@
#include "test/direct_transport.h"
#include "test/drifting_clock.h"
#include "test/encoder_settings.h"
#include "test/fake_audio_device.h"
#include "test/fake_encoder.h"
#include "test/field_trial.h"
#include "test/frame_generator.h"
@ -42,7 +42,6 @@
#include "video/transport_adapter.h"
using webrtc::test::DriftingClock;
using webrtc::test::FakeAudioDevice;
namespace webrtc {
@ -170,10 +169,11 @@ void CallPerfTest::TestAudioVideoSync(FecMode fec,
task_queue_.SendTask([&]() {
metrics::Reset();
rtc::scoped_refptr<FakeAudioDevice> fake_audio_device =
new rtc::RefCountedObject<FakeAudioDevice>(
FakeAudioDevice::CreatePulsedNoiseCapturer(256, 48000),
FakeAudioDevice::CreateDiscardRenderer(48000), audio_rtp_speed);
rtc::scoped_refptr<TestAudioDeviceModule> fake_audio_device =
TestAudioDeviceModule::CreateTestAudioDeviceModule(
TestAudioDeviceModule::CreatePulsedNoiseCapturer(256, 48000),
TestAudioDeviceModule::CreateDiscardRenderer(48000),
audio_rtp_speed);
EXPECT_EQ(0, fake_audio_device->Init());
AudioState::Config send_audio_state_config;

4
test/BUILD.gn
View File

@ -324,13 +324,13 @@ if (rtc_include_tests) {
rtc_test("test_support_unittests") {
deps = [
":fake_audio_device",
":perf_test",
":rtp_test_utils",
"../api:video_frame_api",
"../api:video_frame_api_i420",
"../call:call_interfaces",
"../common_audio",
"../modules/audio_device",
"../modules/rtp_rtcp",
"../rtc_base:rtc_base_approved",
"../system_wrappers",
@ -590,7 +590,6 @@ rtc_source_set("test_common") {
deps = [
":direct_transport",
":fake_audio_device",
":rtp_test_utils",
":test_support",
":video_test_common",
@ -613,6 +612,7 @@ rtc_source_set("test_common") {
"../logging:rtc_event_log_impl_base",
"../media:rtc_internal_video_codecs",
"../media:rtc_media_base",
"../modules/audio_device",
"../modules/audio_device:mock_audio_device",
"../modules/audio_mixer:audio_mixer_impl",
"../modules/audio_processing",

22
test/call_test.cc
View File

@ -333,11 +333,11 @@ void CallTest::CreateFrameGeneratorCapturer(int framerate,
}
void CallTest::CreateFakeAudioDevices(
std::unique_ptr<FakeAudioDevice::Capturer> capturer,
std::unique_ptr<FakeAudioDevice::Renderer> renderer) {
fake_send_audio_device_ = new rtc::RefCountedObject<FakeAudioDevice>(
std::unique_ptr<TestAudioDeviceModule::Capturer> capturer,
std::unique_ptr<TestAudioDeviceModule::Renderer> renderer) {
fake_send_audio_device_ = TestAudioDeviceModule::CreateTestAudioDeviceModule(
std::move(capturer), nullptr, 1.f);
fake_recv_audio_device_ = new rtc::RefCountedObject<FakeAudioDevice>(
fake_recv_audio_device_ = TestAudioDeviceModule::CreateTestAudioDeviceModule(
nullptr, std::move(renderer), 1.f);
}
@ -496,17 +496,17 @@ BaseTest::BaseTest(unsigned int timeout_ms)
BaseTest::~BaseTest() {
}
std::unique_ptr<FakeAudioDevice::Capturer> BaseTest::CreateCapturer() {
return FakeAudioDevice::CreatePulsedNoiseCapturer(256, 48000);
std::unique_ptr<TestAudioDeviceModule::Capturer> BaseTest::CreateCapturer() {
return TestAudioDeviceModule::CreatePulsedNoiseCapturer(256, 48000);
}
std::unique_ptr<FakeAudioDevice::Renderer> BaseTest::CreateRenderer() {
return FakeAudioDevice::CreateDiscardRenderer(48000);
std::unique_ptr<TestAudioDeviceModule::Renderer> BaseTest::CreateRenderer() {
return TestAudioDeviceModule::CreateDiscardRenderer(48000);
}
void BaseTest::OnFakeAudioDevicesCreated(FakeAudioDevice* send_audio_device,
FakeAudioDevice* recv_audio_device) {
}
void BaseTest::OnFakeAudioDevicesCreated(
TestAudioDeviceModule* send_audio_device,
TestAudioDeviceModule* recv_audio_device) {}
Call::Config BaseTest::GetSenderCallConfig() {
return Call::Config(event_log_.get());

19
test/call_test.h
View File

@ -16,8 +16,8 @@
#include "call/call.h"
#include "call/rtp_transport_controller_send.h"
#include "logging/rtc_event_log/rtc_event_log.h"
#include "modules/audio_device/include/test_audio_device.h"
#include "test/encoder_settings.h"
#include "test/fake_audio_device.h"
#include "test/fake_decoder.h"
#include "test/fake_encoder.h"
#include "test/fake_videorenderer.h"
@ -99,8 +99,8 @@ class CallTest : public ::testing::Test {
int height);
void CreateFrameGeneratorCapturer(int framerate, int width, int height);
void CreateFakeAudioDevices(
std::unique_ptr<FakeAudioDevice::Capturer> capturer,
std::unique_ptr<FakeAudioDevice::Renderer> renderer);
std::unique_ptr<TestAudioDeviceModule::Capturer> capturer,
std::unique_ptr<TestAudioDeviceModule::Renderer> renderer);
void CreateVideoStreams();
void CreateAudioStreams();
@ -150,8 +150,8 @@ class CallTest : public ::testing::Test {
private:
rtc::scoped_refptr<AudioProcessing> apm_send_;
rtc::scoped_refptr<AudioProcessing> apm_recv_;
rtc::scoped_refptr<test::FakeAudioDevice> fake_send_audio_device_;
rtc::scoped_refptr<test::FakeAudioDevice> fake_recv_audio_device_;
rtc::scoped_refptr<TestAudioDeviceModule> fake_send_audio_device_;
rtc::scoped_refptr<TestAudioDeviceModule> fake_recv_audio_device_;
};
class BaseTest : public RtpRtcpObserver {
@ -167,10 +167,11 @@ class BaseTest : public RtpRtcpObserver {
virtual size_t GetNumAudioStreams() const;
virtual size_t GetNumFlexfecStreams() const;
virtual std::unique_ptr<FakeAudioDevice::Capturer> CreateCapturer();
virtual std::unique_ptr<FakeAudioDevice::Renderer> CreateRenderer();
virtual void OnFakeAudioDevicesCreated(FakeAudioDevice* send_audio_device,
FakeAudioDevice* recv_audio_device);
virtual std::unique_ptr<TestAudioDeviceModule::Capturer> CreateCapturer();
virtual std::unique_ptr<TestAudioDeviceModule::Renderer> CreateRenderer();
virtual void OnFakeAudioDevicesCreated(
TestAudioDeviceModule* send_audio_device,
TestAudioDeviceModule* recv_audio_device);
virtual Call::Config GetSenderCallConfig();
virtual Call::Config GetReceiverCallConfig();

9
video/video_quality_test.cc
View File

@ -2104,11 +2104,10 @@ void VideoQualityTest::RunWithRenderers(const Params& params) {
Call::Config call_config(event_log_.get());
call_config.bitrate_config = params_.call.call_bitrate_config;
rtc::scoped_refptr<test::FakeAudioDevice> fake_audio_device =
new rtc::RefCountedObject<test::FakeAudioDevice>(
test::FakeAudioDevice::CreatePulsedNoiseCapturer(32000, 48000),
test::FakeAudioDevice::CreateDiscardRenderer(48000),
1.f);
rtc::scoped_refptr<TestAudioDeviceModule> fake_audio_device =
TestAudioDeviceModule::CreateTestAudioDeviceModule(
TestAudioDeviceModule::CreatePulsedNoiseCapturer(32000, 48000),
TestAudioDeviceModule::CreateDiscardRenderer(48000), 1.f);
if (params_.audio.enabled) {
AudioState::Config audio_state_config;