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

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

Issue 2974613003: base->rtc_base: Update .c, .mm and .java files. (Closed)
Patch Set: Created 3 years, 5 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
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/array_view.h"
19 #include "webrtc/base/atomicops.h"
20 #include "webrtc/base/bind.h"
21 #include "webrtc/base/checks.h"
22 #include "webrtc/base/criticalsection.h"
23 #include "webrtc/base/logging.h"
24 #include "webrtc/base/thread.h"
25 #include "webrtc/base/thread_annotations.h"
26 #include "webrtc/base/timeutils.h"
27 #include "webrtc/modules/audio_device/fine_audio_buffer.h" 18 #include "webrtc/modules/audio_device/fine_audio_buffer.h"
19 #include "webrtc/rtc_base/array_view.h"
20 #include "webrtc/rtc_base/atomicops.h"
21 #include "webrtc/rtc_base/bind.h"
22 #include "webrtc/rtc_base/checks.h"
23 #include "webrtc/rtc_base/criticalsection.h"
24 #include "webrtc/rtc_base/logging.h"
25 #include "webrtc/rtc_base/thread.h"
26 #include "webrtc/rtc_base/thread_annotations.h"
27 #include "webrtc/rtc_base/timeutils.h"
28 #include "webrtc/sdk/objc/Framework/Classes/Common/helpers.h" 28 #include "webrtc/sdk/objc/Framework/Classes/Common/helpers.h"
29 #include "webrtc/system_wrappers/include/metrics.h" 29 #include "webrtc/system_wrappers/include/metrics.h"
30 30
31 #import "WebRTC/RTCLogging.h" 31 #import "WebRTC/RTCLogging.h"
32 #import "webrtc/modules/audio_device/ios/objc/RTCAudioSessionDelegateAdapter.h" 32 #import "webrtc/modules/audio_device/ios/objc/RTCAudioSessionDelegateAdapter.h"
33 #import "webrtc/sdk/objc/Framework/Classes/Audio/RTCAudioSession+Private.h" 33 #import "webrtc/sdk/objc/Framework/Classes/Audio/RTCAudioSession+Private.h"
34 #import "webrtc/sdk/objc/Framework/Headers/WebRTC/RTCAudioSession.h" 34 #import "webrtc/sdk/objc/Framework/Headers/WebRTC/RTCAudioSession.h"
35 #import "webrtc/sdk/objc/Framework/Headers/WebRTC/RTCAudioSessionConfiguration.h " 35 #import "webrtc/sdk/objc/Framework/Headers/WebRTC/RTCAudioSessionConfiguration.h "
36 36
37 37
(...skipping 902 matching lines...) Expand 10 before | Expand all | Expand 10 after
940 940
941 // All I/O should be stopped or paused prior to deactivating the audio 941 // All I/O should be stopped or paused prior to deactivating the audio
942 // session, hence we deactivate as last action. 942 // session, hence we deactivate as last action.
943 [session lockForConfiguration]; 943 [session lockForConfiguration];
944 UnconfigureAudioSession(); 944 UnconfigureAudioSession();
945 [session endWebRTCSession:nil]; 945 [session endWebRTCSession:nil];
946 [session unlockForConfiguration]; 946 [session unlockForConfiguration];
947 } 947 }
948 948
949 } // namespace webrtc 949 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698