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

Propagate TaskQueueFactory to AudioDeviceBuffer

Browse Source 
keep using GlobalTaskQueueFactory in android/ios bindings.
Switch to DefaultTaskQueueFactory in tests.

Bug: webrtc:10284
Change-Id: I034c70542be5eeb830be86527830d51204fb2855
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/130223
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27380}
This commit is contained in:
Danil Chapovalov
2019-04-01 09:16:12 +02:00
committed by Commit Bot
parent 105a10aef0
commit 1c41be6e05
24 changed files with 137 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/audio_device/android/audio_device_unittest.cc
View File

@ -17,6 +17,8 @@
#include <vector>
#include "api/scoped_refptr.h"
#include "api/task_queue/default_task_queue_factory.h"
#include "api/task_queue/task_queue_factory.h"
#include "modules/audio_device/android/audio_common.h"
#include "modules/audio_device/android/audio_manager.h"
#include "modules/audio_device/android/build_info.h"
@ -460,7 +462,7 @@ class MockAudioTransportAndroid : public test::MockAudioTransport {
// AudioDeviceTest test fixture.
class AudioDeviceTest : public ::testing::Test {
protected:
AudioDeviceTest() {
AudioDeviceTest() : task_queue_factory_(CreateDefaultTaskQueueFactory()) {
// One-time initialization of JVM and application context. Ensures that we
// can do calls between C++ and Java. Initializes both Java and OpenSL ES
// implementations.
@ -514,7 +516,7 @@ class AudioDeviceTest : public ::testing::Test {
rtc::scoped_refptr<AudioDeviceModule> CreateAudioDevice(
AudioDeviceModule::AudioLayer audio_layer) {
rtc::scoped_refptr<AudioDeviceModule> module(
AudioDeviceModule::Create(audio_layer));
AudioDeviceModule::Create(audio_layer, task_queue_factory_.get()));
return module;
}
@ -639,6 +641,7 @@ class AudioDeviceTest : public ::testing::Test {
}
rtc::Event test_is_done_;
std::unique_ptr<TaskQueueFactory> task_queue_factory_;
rtc::scoped_refptr<AudioDeviceModule> audio_device_;
AudioParameters playout_parameters_;
AudioParameters record_parameters_;