diff options
Diffstat (limited to 'webrtc/test/fake_audio_device.cc')
| -rw-r--r-- | webrtc/test/fake_audio_device.cc | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/webrtc/test/fake_audio_device.cc b/webrtc/test/fake_audio_device.cc index e307dd7664..31cebda652 100644 --- a/webrtc/test/fake_audio_device.cc +++ b/webrtc/test/fake_audio_device.cc @@ -13,11 +13,11 @@ #include <algorithm> #include "testing/gtest/include/gtest/gtest.h" -#include "webrtc/modules/media_file/source/media_file_utility.h" +#include "webrtc/base/platform_thread.h" +#include "webrtc/modules/media_file/media_file_utility.h" #include "webrtc/system_wrappers/include/clock.h" #include "webrtc/system_wrappers/include/event_wrapper.h" #include "webrtc/system_wrappers/include/file_wrapper.h" -#include "webrtc/system_wrappers/include/thread_wrapper.h" namespace webrtc { namespace test { @@ -30,6 +30,7 @@ FakeAudioDevice::FakeAudioDevice(Clock* clock, const std::string& filename) last_playout_ms_(-1), clock_(clock), tick_(EventTimerWrapper::Create()), + thread_(FakeAudioDevice::Run, this, "FakeAudioDevice"), file_utility_(new ModuleFileUtility(0)), input_stream_(FileWrapper::Create()) { memset(captured_audio_, 0, sizeof(captured_audio_)); @@ -42,8 +43,7 @@ FakeAudioDevice::FakeAudioDevice(Clock* clock, const std::string& filename) FakeAudioDevice::~FakeAudioDevice() { Stop(); - if (thread_.get() != NULL) - thread_->Stop(); + thread_.Stop(); } int32_t FakeAudioDevice::Init() { @@ -53,15 +53,8 @@ int32_t FakeAudioDevice::Init() { if (!tick_->StartTimer(true, 10)) return -1; - thread_ = ThreadWrapper::CreateThread(FakeAudioDevice::Run, this, - "FakeAudioDevice"); - if (thread_.get() == NULL) - return -1; - if (!thread_->Start()) { - thread_.reset(); - return -1; - } - thread_->SetPriority(webrtc::kHighPriority); + thread_.Start(); + thread_.SetPriority(rtc::kHighPriority); return 0; } |