admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use Default instead of GlobalTaskQueueFactory to create AudioDeviceBuffer for ios

Browse Source 
Bug: webrtc:10284
Change-Id: Ibeaf3c79335abe9ac32522156b8e20a6e2266c49
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/144034
Reviewed-by: Kári Helgason <kthelgason@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#28427}
This commit is contained in:
Danil Chapovalov 2019-06-27 15:16:34 +02:00 committed by Commit Bot
parent 3e3a6e59dc
commit a6cb1507cc
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sdk/BUILD.gn
View File

@ -272,7 +272,8 @@ if (is_ios || is_mac) {
":audio_session_observer", ":audio_session_observer",
":base_objc", ":base_objc",
"../api:array_view", "../api:array_view",
"../api/task_queue:global_task_queue_factory", "../api/task_queue",
"../api/task_queue:default_task_queue_factory",
"../modules/audio_device:audio_device_api", "../modules/audio_device:audio_device_api",
"../modules/audio_device:audio_device_buffer", "../modules/audio_device:audio_device_buffer",
"../modules/audio_device:audio_device_generic", "../modules/audio_device:audio_device_generic",

2
sdk/objc/native/src/audio/audio_device_module_ios.h
View File

@ -15,6 +15,7 @@
#include "audio_device_ios.h" #include "audio_device_ios.h"
#include "api/task_queue/task_queue_factory.h"
#include "modules/audio_device/audio_device_buffer.h" #include "modules/audio_device/audio_device_buffer.h"
#include "modules/audio_device/include/audio_device.h" #include "modules/audio_device/include/audio_device.h"
#include "rtc_base/checks.h" #include "rtc_base/checks.h"
@ -130,6 +131,7 @@ class AudioDeviceModuleIOS : public AudioDeviceModule {
#endif // WEBRTC_IOS #endif // WEBRTC_IOS
private: private:
bool initialized_ = false; bool initialized_ = false;
const std::unique_ptr<TaskQueueFactory> task_queue_factory_;
std::unique_ptr<AudioDeviceIOS> audio_device_; std::unique_ptr<AudioDeviceIOS> audio_device_;
std::unique_ptr<AudioDeviceBuffer> audio_device_buffer_; std::unique_ptr<AudioDeviceBuffer> audio_device_buffer_;
}; };

13
sdk/objc/native/src/audio/audio_device_module_ios.mm
View File

@ -10,7 +10,7 @@
#include "audio_device_module_ios.h" #include "audio_device_module_ios.h"
#include "api/task_queue/global_task_queue_factory.h" #include "api/task_queue/default_task_queue_factory.h"
#include "modules/audio_device/audio_device_config.h" #include "modules/audio_device/audio_device_config.h"
#include "modules/audio_device/audio_device_generic.h" #include "modules/audio_device/audio_device_generic.h"
#include "rtc_base/checks.h" #include "rtc_base/checks.h"
@ -40,10 +40,11 @@
namespace webrtc { namespace webrtc {
namespace ios_adm { namespace ios_adm {
AudioDeviceModuleIOS::AudioDeviceModuleIOS() { AudioDeviceModuleIOS::AudioDeviceModuleIOS()
RTC_LOG(INFO) << "current platform is IOS"; : task_queue_factory_(CreateDefaultTaskQueueFactory()) {
RTC_LOG(INFO) << "iPhone Audio APIs will be utilized."; RTC_LOG(INFO) << "current platform is IOS";
} RTC_LOG(INFO) << "iPhone Audio APIs will be utilized.";
}
int32_t AudioDeviceModuleIOS::AttachAudioBuffer() { int32_t AudioDeviceModuleIOS::AttachAudioBuffer() {
RTC_LOG(INFO) << __FUNCTION__; RTC_LOG(INFO) << __FUNCTION__;
@ -70,7 +71,7 @@ namespace ios_adm {
if (initialized_) if (initialized_)
return 0; return 0;
audio_device_buffer_.reset(new webrtc::AudioDeviceBuffer(&GlobalTaskQueueFactory())); audio_device_buffer_.reset(new webrtc::AudioDeviceBuffer(task_queue_factory_.get()));
audio_device_.reset(new ios_adm::AudioDeviceIOS()); audio_device_.reset(new ios_adm::AudioDeviceIOS());
RTC_CHECK(audio_device_); RTC_CHECK(audio_device_);