Changeset 1482

Timestamp:

Oct 6, 2007 5:31:09 PM (17 years ago)

Author:

bennylp

Message:

Ticket #393: Added configuration to set basic audio frame length to minimize audio latency in pjsua-lib

Location:

pjproject/trunk/pjsip

Files:

• include/pjsua-lib/pjsua.h (modified) (3 diffs)
• src/pjsua-lib/pjsua_core.c (modified) (2 diffs)
• src/pjsua-lib/pjsua_media.c (modified) (4 diffs)

pjproject/trunk/pjsip/include/pjsua-lib/pjsua.h

@@ -1745 +1745 @@
  */
 #ifndef PJSUA_SECURE_SCHEME
-#   define PJSUA_SECURE_SCHEME          "sip"
+#   define PJSUA_SECURE_SCHEME          "sips"
 #endif
 
@@ -3467 +3467 @@
 
     /**
+     * Specify audio frame ptime. The value here will affect the 
+     * samples per frame of both the sound device and the conference
+     * bridge. Specifying lower ptime will normally reduce the
+     * latency.
+     *
+     * Default: 20 (miliseconds)
+     */
+    unsigned            audio_frame_ptime;
+
+    /**
      * Specify maximum number of media ports to be created in the
      * conference bridge. Since all media terminate in the bridge
@@ -3506 +3516 @@
 
     /**
-     * Specify default ptime.
+     * Specify default codec ptime.
      *
      * Default: 0 (codec specific)

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

@@ -155 +155 @@
 
     cfg->clock_rate = PJSUA_DEFAULT_CLOCK_RATE;
+    cfg->audio_frame_ptime = 10;
     cfg->max_media_ports = 32;
     cfg->has_ioqueue = PJ_TRUE;
@@ -1881 +1882 @@
 
     p = pjsip_parse_uri(pool, url, len, 0);
-    if (!p || pj_stricmp2(pjsip_uri_get_scheme(p), "sip") != 0)
+    if (!p || (pj_stricmp2(pjsip_uri_get_scheme(p), "sip") != 0 &&
+               pj_stricmp2(pjsip_uri_get_scheme(p), "sips") != 0))
+    {
         p = NULL;
+    }
 
     pj_pool_release(pool);

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

@@ -23 +23 @@
 #define THIS_FILE               "pjsua_media.c"
 
-#define PTIME               20
-#define FPS                 (1000/PTIME)
 #define DEFAULT_RTP_PORT    4000
 
@@ -156 +154 @@
      */
     pjsua_var.mconf_cfg.samples_per_frame = pjsua_var.media_cfg.clock_rate * 
-                                            PTIME / 1000;
+                                            pjsua_var.media_cfg.audio_frame_ptime / 
+                                            1000;
     pjsua_var.mconf_cfg.channel_count = 1;
     pjsua_var.mconf_cfg.bits_per_sample = 16;
@@ -1649 +1648 @@
     for (i=0; i<PJ_ARRAY_SIZE(clock_rates); ++i) {
         char errmsg[PJ_ERR_MSG_SIZE];
+        unsigned fps;
 
         PJ_LOG(4,(THIS_FILE, 
@@ -1655 +1655 @@
 
         /* Create the sound device. Sound port will start immediately. */
+        fps = 1000 / pjsua_var.media_cfg.audio_frame_ptime;
         status = pjmedia_snd_port_create(pjsua_var.pool, capture_dev,
                                          playback_dev, 
                                          clock_rates[i], 1,
-                                         clock_rates[i]/FPS,
+                                         clock_rates[i]/fps,
                                          16, 0, &pjsua_var.snd_port);