From 43bd7601d72f353b202de4dc639ffe7e5d191093 Mon Sep 17 00:00:00 2001 From: Byoungchan Lee Date: Tue, 8 Oct 2019 23:58:41 +0900 Subject: [PATCH] Fix build errors of RTCAudioDeviceTests This happend because sdk_unittests is not built on arm/arm64 iOS build. Bug: webrtc:11022 Change-Id: I8f9adfd48e11c8512c27992804cc9b69dff15ded Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/156100 Commit-Queue: Anders Carlsson Reviewed-by: Anders Carlsson Cr-Commit-Position: refs/heads/master@{#29407} --- sdk/BUILD.gn | 1 + sdk/objc/unittests/RTCAudioDevice_xctest.mm | 13 ++++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/sdk/BUILD.gn b/sdk/BUILD.gn index fa29b8fb62..2c8a114c27 100644 --- a/sdk/BUILD.gn +++ b/sdk/BUILD.gn @@ -1090,6 +1090,7 @@ if (is_ios || is_mac) { ":videosource_objc", ":videotoolbox_objc", "../api:scoped_refptr", + "../api/task_queue:default_task_queue_factory", "../api/video:video_frame_i420", "../common_video", "../media:rtc_media_base", diff --git a/sdk/objc/unittests/RTCAudioDevice_xctest.mm b/sdk/objc/unittests/RTCAudioDevice_xctest.mm index 7ecc43a77a..10d3994743 100644 --- a/sdk/objc/unittests/RTCAudioDevice_xctest.mm +++ b/sdk/objc/unittests/RTCAudioDevice_xctest.mm @@ -9,11 +9,14 @@ */ #import + +#include "api/task_queue/default_task_queue_factory.h" + #import "sdk/objc/components/audio/RTCAudioSession+Private.h" #import "sdk/objc/native/api/audio_device_module.h" #import "sdk/objc/native/src/audio/audio_device_ios.h" -@interface RTCAudioDeviceTests: XCTestCase { +@interface RTCAudioDeviceTests : XCTestCase { rtc::scoped_refptr _audioDeviceModule; std::unique_ptr _audio_device; } @@ -35,9 +38,7 @@ NSError *error = nil; [self.audioSession lockForConfiguration]; - [self.audioSession setCategory:AVAudioSessionCategoryPlayAndRecord - withOptions:0 - error:&error]; + [self.audioSession setCategory:AVAudioSessionCategoryPlayAndRecord withOptions:0 error:&error]; XCTAssertNil(error); [self.audioSession setMode:AVAudioSessionModeVoiceChat error:&error]; @@ -82,8 +83,10 @@ [self.audioSession.category isEqual:AVAudioSessionCategoryPlayback]); XCTAssertEqual(AVAudioSessionModeVoiceChat, self.audioSession.mode); + std::unique_ptr task_queue_factory = + webrtc::CreateDefaultTaskQueueFactory(); std::unique_ptr audio_buffer; - audio_buffer.reset(new webrtc::AudioDeviceBuffer()); + audio_buffer.reset(new webrtc::AudioDeviceBuffer(task_queue_factory.get())); _audio_device->AttachAudioBuffer(audio_buffer.get()); XCTAssertEqual(webrtc::AudioDeviceGeneric::InitStatus::OK, _audio_device->Init()); XCTAssertEqual(0, _audio_device->InitPlayout());