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

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

Issue 1746023002: Modifies SDK and iOS detection for helper method that needs iOS 9+ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Improvements proposed by tkchin@ Created 4 years, 9 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 | « no previous file | webrtc/modules/utility/include/helpers_ios.h » ('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
(...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 LOG(LS_INFO) << " channels per packet: " << absd.mChannelsPerFrame; 255 LOG(LS_INFO) << " channels per packet: " << absd.mChannelsPerFrame;
256 LOG(LS_INFO) << " bits per channel: " << absd.mBitsPerChannel; 256 LOG(LS_INFO) << " bits per channel: " << absd.mBitsPerChannel;
257 LOG(LS_INFO) << " reserved: " << absd.mReserved; 257 LOG(LS_INFO) << " reserved: " << absd.mReserved;
258 } 258 }
259 259
260 // Helper method that logs essential device information strings. 260 // Helper method that logs essential device information strings.
261 static void LogDeviceInfo() { 261 static void LogDeviceInfo() {
262 LOG(LS_INFO) << "LogDeviceInfo"; 262 LOG(LS_INFO) << "LogDeviceInfo";
263 @autoreleasepool { 263 @autoreleasepool {
264 LOG(LS_INFO) << " system name: " << ios::GetSystemName(); 264 LOG(LS_INFO) << " system name: " << ios::GetSystemName();
265 LOG(LS_INFO) << " system version: " << ios::GetSystemVersion(); 265 LOG(LS_INFO) << " system version 1(2): " << ios::GetSystemVersionAsString();
tkchin_webrtc 2016/03/02 19:23:45 do we need both?
henrika_webrtc 2016/03/03 13:55:25 If you don't mind I think we should keep both. Tod
266 LOG(LS_INFO) << " system version 2(2): " << ios::GetSystemVersion();
266 LOG(LS_INFO) << " device type: " << ios::GetDeviceType(); 267 LOG(LS_INFO) << " device type: " << ios::GetDeviceType();
267 LOG(LS_INFO) << " device name: " << ios::GetDeviceName(); 268 LOG(LS_INFO) << " device name: " << ios::GetDeviceName();
268 LOG(LS_INFO) << " process name: " << ios::GetProcessName(); 269 LOG(LS_INFO) << " process name: " << ios::GetProcessName();
269 LOG(LS_INFO) << " process ID: " << ios::GetProcessID(); 270 LOG(LS_INFO) << " process ID: " << ios::GetProcessID();
270 LOG(LS_INFO) << " OS version: " << ios::GetOSVersionString(); 271 LOG(LS_INFO) << " OS version: " << ios::GetOSVersionString();
271 LOG(LS_INFO) << " processing cores: " << ios::GetProcessorCount(); 272 LOG(LS_INFO) << " processing cores: " << ios::GetProcessorCount();
273 #if defined(__IPHONE_9_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_9_0
272 LOG(LS_INFO) << " low power mode: " << ios::GetLowPowerModeEnabled(); 274 LOG(LS_INFO) << " low power mode: " << ios::GetLowPowerModeEnabled();
275 #endif
273 } 276 }
274 } 277 }
275 #endif // !defined(NDEBUG) 278 #endif // !defined(NDEBUG)
276 279
277 AudioDeviceIOS::AudioDeviceIOS() 280 AudioDeviceIOS::AudioDeviceIOS()
278 : audio_device_buffer_(nullptr), 281 : audio_device_buffer_(nullptr),
279 vpio_unit_(nullptr), 282 vpio_unit_(nullptr),
280 recording_(0), 283 recording_(0),
281 playing_(0), 284 playing_(0),
282 initialized_(false), 285 initialized_(false),
(...skipping 806 matching lines...) Expand 10 before | Expand all | Expand 10 after
1089 // Read decoded 16-bit PCM samples from WebRTC (using a size that matches 1092 // Read decoded 16-bit PCM samples from WebRTC (using a size that matches
1090 // the native I/O audio unit) to a preallocated intermediate buffer and 1093 // the native I/O audio unit) to a preallocated intermediate buffer and
1091 // copy the result to the audio buffer in the |io_data| destination. 1094 // copy the result to the audio buffer in the |io_data| destination.
1092 SInt8* source = playout_audio_buffer_.get(); 1095 SInt8* source = playout_audio_buffer_.get();
1093 fine_audio_buffer_->GetPlayoutData(source); 1096 fine_audio_buffer_->GetPlayoutData(source);
1094 memcpy(destination, source, dataSizeInBytes); 1097 memcpy(destination, source, dataSizeInBytes);
1095 return noErr; 1098 return noErr;
1096 } 1099 }
1097 1100
1098 } // namespace webrtc 1101 } // namespace webrtc
OLDNEW
« no previous file with comments | « no previous file | webrtc/modules/utility/include/helpers_ios.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698