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

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

Issue 1417683006: modules: more interface -> include renames (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Fix last incorrectly wrapped pragma message Created 5 years, 1 month 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 #if !defined(__has_feature) || !__has_feature(objc_arc) 11 #if !defined(__has_feature) || !__has_feature(objc_arc)
12 #error "This file requires ARC support." 12 #error "This file requires ARC support."
13 #endif 13 #endif
14 14
15 #import <AVFoundation/AVFoundation.h> 15 #import <AVFoundation/AVFoundation.h>
16 #import <Foundation/Foundation.h> 16 #import <Foundation/Foundation.h>
17 17
18 #include "webrtc/modules/audio_device/ios/audio_device_ios.h" 18 #include "webrtc/modules/audio_device/ios/audio_device_ios.h"
19 19
20 #include "webrtc/base/atomicops.h" 20 #include "webrtc/base/atomicops.h"
21 #include "webrtc/base/checks.h" 21 #include "webrtc/base/checks.h"
22 #include "webrtc/base/logging.h" 22 #include "webrtc/base/logging.h"
23 #include "webrtc/modules/audio_device/fine_audio_buffer.h" 23 #include "webrtc/modules/audio_device/fine_audio_buffer.h"
24 #include "webrtc/modules/utility/interface/helpers_ios.h" 24 #include "webrtc/modules/utility/include/helpers_ios.h"
25 25
26 namespace webrtc { 26 namespace webrtc {
27 27
28 #define LOGI() LOG(LS_INFO) << "AudioDeviceIOS::" 28 #define LOGI() LOG(LS_INFO) << "AudioDeviceIOS::"
29 29
30 #define LOG_AND_RETURN_IF_ERROR(error, message) \ 30 #define LOG_AND_RETURN_IF_ERROR(error, message) \
31 do { \ 31 do { \
32 OSStatus err = error; \ 32 OSStatus err = error; \
33 if (err) { \ 33 if (err) { \
34 LOG(LS_ERROR) << message << ": " << err; \ 34 LOG(LS_ERROR) << message << ": " << err; \
(...skipping 882 matching lines...) Expand 10 before | Expand all | Expand 10 after
917 // Read decoded 16-bit PCM samples from WebRTC (using a size that matches 917 // Read decoded 16-bit PCM samples from WebRTC (using a size that matches
918 // the native I/O audio unit) to a preallocated intermediate buffer and 918 // the native I/O audio unit) to a preallocated intermediate buffer and
919 // copy the result to the audio buffer in the |io_data| destination. 919 // copy the result to the audio buffer in the |io_data| destination.
920 SInt8* source = playout_audio_buffer_.get(); 920 SInt8* source = playout_audio_buffer_.get();
921 fine_audio_buffer_->GetPlayoutData(source); 921 fine_audio_buffer_->GetPlayoutData(source);
922 memcpy(destination, source, dataSizeInBytes); 922 memcpy(destination, source, dataSizeInBytes);
923 return noErr; 923 return noErr;
924 } 924 }
925 925
926 } // namespace webrtc 926 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/audio_device/include/audio_device.h ('k') | webrtc/modules/audio_device/test/audio_device_test_defines.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698