Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(113)

Side by Side Diff: webrtc/modules/audio_device/ios/audio_device_ios.mm

Issue 2890513002: Revert of Split iOS sdk in to separate targets (Closed)
Patch Set: Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « webrtc/modules/audio_device/BUILD.gn ('k') | webrtc/modules/video_coding/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #import <AVFoundation/AVFoundation.h> 11 #import <AVFoundation/AVFoundation.h>
12 #import <Foundation/Foundation.h> 12 #import <Foundation/Foundation.h>
13 13
14 #include "webrtc/modules/audio_device/ios/audio_device_ios.h" 14 #include "webrtc/modules/audio_device/ios/audio_device_ios.h"
15 15
16 #include <cmath> 16 #include <cmath>
17 17
18 #include "webrtc/base/atomicops.h" 18 #include "webrtc/base/atomicops.h"
19 #include "webrtc/base/bind.h" 19 #include "webrtc/base/bind.h"
20 #include "webrtc/base/checks.h" 20 #include "webrtc/base/checks.h"
21 #include "webrtc/base/criticalsection.h" 21 #include "webrtc/base/criticalsection.h"
22 #include "webrtc/base/logging.h" 22 #include "webrtc/base/logging.h"
23 #include "webrtc/base/thread.h" 23 #include "webrtc/base/thread.h"
24 #include "webrtc/base/thread_annotations.h" 24 #include "webrtc/base/thread_annotations.h"
25 #include "webrtc/modules/audio_device/fine_audio_buffer.h" 25 #include "webrtc/modules/audio_device/fine_audio_buffer.h"
26 #include "webrtc/sdk/objc/Framework/Classes/Common/helpers.h" 26 #include "webrtc/sdk/objc/Framework/Classes/helpers.h"
27 27
28 #import "WebRTC/RTCLogging.h" 28 #import "WebRTC/RTCLogging.h"
29 #import "webrtc/modules/audio_device/ios/objc/RTCAudioSession.h" 29 #import "webrtc/modules/audio_device/ios/objc/RTCAudioSession.h"
30 #import "webrtc/modules/audio_device/ios/objc/RTCAudioSession+Private.h" 30 #import "webrtc/modules/audio_device/ios/objc/RTCAudioSession+Private.h"
31 #import "webrtc/modules/audio_device/ios/objc/RTCAudioSessionConfiguration.h" 31 #import "webrtc/modules/audio_device/ios/objc/RTCAudioSessionConfiguration.h"
32 #import "webrtc/modules/audio_device/ios/objc/RTCAudioSessionDelegateAdapter.h" 32 #import "webrtc/modules/audio_device/ios/objc/RTCAudioSessionDelegateAdapter.h"
33 33
34 namespace webrtc { 34 namespace webrtc {
35 35
36 #define LOGI() LOG(LS_INFO) << "AudioDeviceIOS::" 36 #define LOGI() LOG(LS_INFO) << "AudioDeviceIOS::"
(...skipping 800 matching lines...) Expand 10 before | Expand all | Expand 10 after
837 837
838 // All I/O should be stopped or paused prior to deactivating the audio 838 // All I/O should be stopped or paused prior to deactivating the audio
839 // session, hence we deactivate as last action. 839 // session, hence we deactivate as last action.
840 [session lockForConfiguration]; 840 [session lockForConfiguration];
841 UnconfigureAudioSession(); 841 UnconfigureAudioSession();
842 [session endWebRTCSession:nil]; 842 [session endWebRTCSession:nil];
843 [session unlockForConfiguration]; 843 [session unlockForConfiguration];
844 } 844 }
845 845
846 } // namespace webrtc 846 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/audio_device/BUILD.gn ('k') | webrtc/modules/video_coding/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698