Changeset 4610 for pjproject/trunk/pjlib/src/pj/os_info.c

Timestamp:

Oct 3, 2013 10:26:14 AM (11 years ago)

Author:

ming

Message:

Re #1697: Add device info in pj_get_sys_info() and set default clock rate for iPhone 5 running iOS7 to 44100Hz

File:

• pjproject/trunk/pjlib/src/pj/os_info.c (modified) (2 diffs)

pjproject/trunk/pjlib/src/pj/os_info.c

@@ -58 +58 @@
 
 #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
@@ -152 +154 @@
     {
         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;