ff761fba82
This changes the following module directories:
* webrtc/modules/audio_conference_mixer/interface
* webrtc/modules/interface
* webrtc/modules/media_file/interface
* webrtc/modules/rtp_rtcp/interface
* webrtc/modules/utility/interface
To avoid breaking downstream, I followed this recipe:
1. Copy the interface dir to a new sibling directory: include
2. Update the header guards in the include directory to match the style guide.
3. Update the header guards in the interface directory to match the ones in include. This is required to avoid getting redefinitions in the not-yet-updated downstream code.
4. Add a pragma warning in the header files in the interface dir. Example:
#pragma message("WARNING: webrtc/modules/interface is DEPRECATED; "
"use webrtc/modules/include")
5. Search for all source references to webrtc/modules/interface and update them to webrtc/modules/include (*.c*,*.h,*.mm,*.S)
6. Update all GYP+GN files. This required manual inspection since many subdirectories of webrtc/modules referenced the interface dir using ../interface etc(*.gyp*,*.gn*)
BUG=5095
TESTED=Passing compile-trybots with --clobber flag:
git cl try --clobber --bot=win_compile_rel --bot=linux_compile_rel --bot=android_compile_rel --bot=mac_compile_rel --bot=ios_rel -m tryserver.webrtc
R=stefan@webrtc.org, tommi@webrtc.org
Review URL: https://codereview.webrtc.org/1417683006 .
Cr-Commit-Position: refs/heads/master@{#10500}
183 lines
6.3 KiB
Plaintext
183 lines
6.3 KiB
Plaintext
/*
|
|
* Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#if defined(WEBRTC_IOS)
|
|
|
|
#import <AVFoundation/AVFoundation.h>
|
|
#import <Foundation/Foundation.h>
|
|
#import <sys/sysctl.h>
|
|
#import <UIKit/UIKit.h>
|
|
|
|
#include "webrtc/base/checks.h"
|
|
#include "webrtc/base/logging.h"
|
|
#include "webrtc/base/scoped_ptr.h"
|
|
#include "webrtc/modules/utility/include/helpers_ios.h"
|
|
|
|
namespace webrtc {
|
|
namespace ios {
|
|
|
|
// TODO(henrika): move to shared location.
|
|
// See https://code.google.com/p/webrtc/issues/detail?id=4773 for details.
|
|
NSString* NSStringFromStdString(const std::string& stdString) {
|
|
// std::string may contain null termination character so we construct
|
|
// using length.
|
|
return [[NSString alloc] initWithBytes:stdString.data()
|
|
length:stdString.length()
|
|
encoding:NSUTF8StringEncoding];
|
|
}
|
|
|
|
std::string StdStringFromNSString(NSString* nsString) {
|
|
NSData* charData = [nsString dataUsingEncoding:NSUTF8StringEncoding];
|
|
return std::string(reinterpret_cast<const char*>([charData bytes]),
|
|
[charData length]);
|
|
}
|
|
|
|
bool CheckAndLogError(BOOL success, NSError* error) {
|
|
if (!success) {
|
|
NSString* msg =
|
|
[NSString stringWithFormat:@"Error: %ld, %@, %@", (long)error.code,
|
|
error.localizedDescription,
|
|
error.localizedFailureReason];
|
|
LOG(LS_ERROR) << StdStringFromNSString(msg);
|
|
return false;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
// TODO(henrika): see if it is possible to move to GetThreadName in
|
|
// platform_thread.h and base it on pthread methods instead.
|
|
std::string GetCurrentThreadDescription() {
|
|
NSString* name = [NSString stringWithFormat:@"%@", [NSThread currentThread]];
|
|
return StdStringFromNSString(name);
|
|
}
|
|
|
|
std::string GetAudioSessionCategory() {
|
|
NSString* category = [[AVAudioSession sharedInstance] category];
|
|
return StdStringFromNSString(category);
|
|
}
|
|
|
|
std::string GetSystemName() {
|
|
NSString* osName = [[UIDevice currentDevice] systemName];
|
|
return StdStringFromNSString(osName);
|
|
}
|
|
|
|
std::string GetSystemVersion() {
|
|
NSString* osVersion = [[UIDevice currentDevice] systemVersion];
|
|
return StdStringFromNSString(osVersion);
|
|
}
|
|
|
|
float GetSystemVersionAsFloat() {
|
|
NSString* osVersion = [[UIDevice currentDevice] systemVersion];
|
|
return osVersion.floatValue;
|
|
}
|
|
|
|
std::string GetDeviceType() {
|
|
NSString* deviceModel = [[UIDevice currentDevice] model];
|
|
return StdStringFromNSString(deviceModel);
|
|
}
|
|
|
|
std::string GetDeviceName() {
|
|
size_t size;
|
|
sysctlbyname("hw.machine", NULL, &size, NULL, 0);
|
|
rtc::scoped_ptr<char[]> machine;
|
|
machine.reset(new char[size]);
|
|
sysctlbyname("hw.machine", machine.get(), &size, NULL, 0);
|
|
std::string raw_name(machine.get());
|
|
if (!raw_name.compare("iPhone1,1"))
|
|
return std::string("iPhone 1G");
|
|
if (!raw_name.compare("iPhone1,2"))
|
|
return std::string("iPhone 3G");
|
|
if (!raw_name.compare("iPhone2,1"))
|
|
return std::string("iPhone 3GS");
|
|
if (!raw_name.compare("iPhone3,1"))
|
|
return std::string("iPhone 4");
|
|
if (!raw_name.compare("iPhone3,3"))
|
|
return std::string("Verizon iPhone 4");
|
|
if (!raw_name.compare("iPhone4,1"))
|
|
return std::string("iPhone 4S");
|
|
if (!raw_name.compare("iPhone5,1"))
|
|
return std::string("iPhone 5 (GSM)");
|
|
if (!raw_name.compare("iPhone5,2"))
|
|
return std::string("iPhone 5 (GSM+CDMA)");
|
|
if (!raw_name.compare("iPhone5,3"))
|
|
return std::string("iPhone 5c (GSM)");
|
|
if (!raw_name.compare("iPhone5,4"))
|
|
return std::string("iPhone 5c (GSM+CDMA)");
|
|
if (!raw_name.compare("iPhone6,1"))
|
|
return std::string("iPhone 5s (GSM)");
|
|
if (!raw_name.compare("iPhone6,2"))
|
|
return std::string("iPhone 5s (GSM+CDMA)");
|
|
if (!raw_name.compare("iPhone7,1"))
|
|
return std::string("iPhone 6 Plus");
|
|
if (!raw_name.compare("iPhone7,2"))
|
|
return std::string("iPhone 6");
|
|
if (!raw_name.compare("iPhone8,1"))
|
|
return std::string("iPhone 6s");
|
|
if (!raw_name.compare("iPhone8,2"))
|
|
return std::string("iPhone 6s Plus");
|
|
if (!raw_name.compare("iPod1,1"))
|
|
return std::string("iPod Touch 1G");
|
|
if (!raw_name.compare("iPod2,1"))
|
|
return std::string("iPod Touch 2G");
|
|
if (!raw_name.compare("iPod3,1"))
|
|
return std::string("iPod Touch 3G");
|
|
if (!raw_name.compare("iPod4,1"))
|
|
return std::string("iPod Touch 4G");
|
|
if (!raw_name.compare("iPod5,1"))
|
|
return std::string("iPod Touch 5G");
|
|
if (!raw_name.compare("iPad1,1"))
|
|
return std::string("iPad");
|
|
if (!raw_name.compare("iPad2,1"))
|
|
return std::string("iPad 2 (WiFi)");
|
|
if (!raw_name.compare("iPad2,2"))
|
|
return std::string("iPad 2 (GSM)");
|
|
if (!raw_name.compare("iPad2,3"))
|
|
return std::string("iPad 2 (CDMA)");
|
|
if (!raw_name.compare("iPad2,4"))
|
|
return std::string("iPad 2 (WiFi)");
|
|
if (!raw_name.compare("iPad2,5"))
|
|
return std::string("iPad Mini (WiFi)");
|
|
if (!raw_name.compare("iPad2,6"))
|
|
return std::string("iPad Mini (GSM)");
|
|
if (!raw_name.compare("iPad2,7"))
|
|
return std::string("iPad Mini (GSM+CDMA)");
|
|
if (!raw_name.compare("iPad3,1"))
|
|
return std::string("iPad 3 (WiFi)");
|
|
if (!raw_name.compare("iPad3,2"))
|
|
return std::string("iPad 3 (GSM+CDMA)");
|
|
if (!raw_name.compare("iPad3,3"))
|
|
return std::string("iPad 3 (GSM)");
|
|
if (!raw_name.compare("iPad3,4"))
|
|
return std::string("iPad 4 (WiFi)");
|
|
if (!raw_name.compare("iPad3,5"))
|
|
return std::string("iPad 4 (GSM)");
|
|
if (!raw_name.compare("iPad3,6"))
|
|
return std::string("iPad 4 (GSM+CDMA)");
|
|
if (!raw_name.compare("iPad4,1"))
|
|
return std::string("iPad Air (WiFi)");
|
|
if (!raw_name.compare("iPad4,2"))
|
|
return std::string("iPad Air (Cellular)");
|
|
if (!raw_name.compare("iPad4,4"))
|
|
return std::string("iPad mini 2G (WiFi)");
|
|
if (!raw_name.compare("iPad4,5"))
|
|
return std::string("iPad mini 2G (Cellular)");
|
|
if (!raw_name.compare("i386"))
|
|
return std::string("Simulator");
|
|
if (!raw_name.compare("x86_64"))
|
|
return std::string("Simulator");
|
|
LOG(LS_WARNING) << "Failed to find device name (" << raw_name << ")";
|
|
return raw_name;
|
|
}
|
|
|
|
} // namespace ios
|
|
} // namespace webrtc
|
|
|
|
#endif // defined(WEBRTC_IOS)
|