Changeset 4610 for pjproject/trunk

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

Location:

pjproject/trunk

Files:

• pjlib/src/pj/os_info.c (modified) (2 diffs)
• pjsip/src/pjsua-lib/pjsua_core.c (modified) (1 diff)

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;
 

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_core.c

@@ -310 +310 @@
 PJ_DEF(void) pjsua_media_config_default(pjsua_media_config *cfg)
 {
+    const pj_sys_info *si = pj_get_sys_info();
+    pj_str_t dev_model = {"iPhone5", 7};
+    
     pj_bzero(cfg, sizeof(*cfg));
 
     cfg->clock_rate = PJSUA_DEFAULT_CLOCK_RATE;
-    cfg->snd_clock_rate = 0;
+    /* It is reported that there may be some media server resampling problem
+     * with iPhone 5 devices running iOS 7, so we set the sound device's
+     * clock rate to 44100 to avoid resampling.
+     */
+    if (pj_stristr(&si->machine, &dev_model) &&
+        ((si->os_ver & 0xFF000000) >> 24) >= 7)
+    {
+        cfg->snd_clock_rate = 44100;
+    } else {
+        cfg->snd_clock_rate = 0;
+    }
     cfg->channel_count = 1;
     cfg->audio_frame_ptime = PJSUA_DEFAULT_AUDIO_FRAME_PTIME;