summaryrefslogtreecommitdiff
path: root/pjlib
diff options
context:
space:
mode:
authorLiong Sauw Ming <ming@teluu.com>2013-10-03 10:26:14 +0000
committerLiong Sauw Ming <ming@teluu.com>2013-10-03 10:26:14 +0000
commit5732af557fb9dee021bb3f8996954682b410aaca (patch)
treedff688a924b00b9aefa0a93d0a8a371bb0a4a871 /pjlib
parent420902fd4b501515600a6971c5b895d44121124c (diff)
Re #1697: Add device info in pj_get_sys_info() and set default clock rate for iPhone 5 running iOS7 to 44100Hz
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4610 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjlib')
-rw-r--r--pjlib/src/pj/os_info.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/pjlib/src/pj/os_info.c b/pjlib/src/pj/os_info.c
index dfa486c5..514ff242 100644
--- a/pjlib/src/pj/os_info.c
+++ b/pjlib/src/pj/os_info.c
@@ -57,6 +57,8 @@
#if defined(PJ_DARWINOS) && PJ_DARWINOS != 0 && TARGET_OS_IPHONE
+# include <sys/types.h>
+# include <sys/sysctl.h>
void pj_iphone_os_get_sys_info(pj_sys_info *si, pj_str_t *si_buffer);
#endif
@@ -151,16 +153,20 @@ PJ_DEF(const pj_sys_info*) pj_get_sys_info(void)
(!defined TARGET_IPHONE_SIMULATOR || TARGET_IPHONE_SIMULATOR == 0)
{
pj_str_t buf = {si_buffer + PJ_SYS_INFO_BUFFER_SIZE - left, left};
- pj_str_t machine = {"arm", 3};
+ pj_str_t machine = {"arm-", 4};
pj_str_t sdk_name = {"iOS-SDK", 7};
+ size_t size = PJ_SYS_INFO_BUFFER_SIZE - machine.slen;
char tmp[PJ_SYS_INFO_BUFFER_SIZE];
-
+ int name[] = {CTL_HW,HW_MACHINE};
+
pj_iphone_os_get_sys_info(&si, &buf);
left -= si.os_name.slen + 1;
si.os_ver = parse_version(si.machine.ptr);
-
- si.machine = machine;
+
+ pj_memcpy(tmp, machine.ptr, machine.slen);
+ sysctl(name, 2, tmp+machine.slen, &size, NULL, 0);
+ ALLOC_CP_STR(tmp, machine);
si.sdk_name = sdk_name;
#ifdef PJ_SDK_NAME