Changeset 2007 for pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c

Timestamp:

Jun 12, 2008 12:48:59 PM (16 years ago)

Author:

nanang

Message:

Ticket #542: added new API and macro for sound device latency settings, also added new param for this in pjsua

File:

• pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c (modified) (8 diffs)

pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c

@@ -86 +86 @@
 
     int                     capture_dev, playback_dev;
+    unsigned                capture_lat, playback_lat;
 } app_config;
 
@@ -195 +196 @@
     puts  ("  --capture-dev=id    Audio capture device ID (default=-1)");
     puts  ("  --playback-dev=id   Audio playback device ID (default=-1)");
+    puts  ("  --capture-lat=N     Audio capture latency, in ms (default=10)");
+    puts  ("  --playback-lat=N    Audio playback latency, in ms (default=100)");
 
     puts  ("");
@@ -253 +256 @@
     cfg->capture_dev = PJSUA_INVALID_ID;
     cfg->playback_dev = PJSUA_INVALID_ID;
+    cfg->capture_lat = PJMEDIA_SND_DEFAULT_REC_LATENCY;
+    cfg->playback_lat = PJMEDIA_SND_DEFAULT_PLAY_LATENCY;
 
     for (i=0; i<PJ_ARRAY_SIZE(cfg->acc_cfg); ++i)
@@ -414 +419 @@
            OPT_TLS_NEG_TIMEOUT,
            OPT_CAPTURE_DEV, OPT_PLAYBACK_DEV,
+           OPT_CAPTURE_LAT, OPT_PLAYBACK_LAT,
            OPT_AUTO_UPDATE_NAT,OPT_USE_COMPACT_FORM,OPT_DIS_CODEC
     };
@@ -500 +506 @@
         { "capture-dev",    1, 0, OPT_CAPTURE_DEV},
         { "playback-dev",   1, 0, OPT_PLAYBACK_DEV},
+        { "capture-lat",    1, 0, OPT_CAPTURE_LAT},
+        { "playback-lat",   1, 0, OPT_PLAYBACK_LAT},
         { NULL, 0, 0, 0}
     };
@@ -1076 +1084 @@
         case OPT_PLAYBACK_DEV:
             cfg->playback_dev = atoi(pj_optarg);
+            break;
+
+        case OPT_CAPTURE_LAT:
+            cfg->capture_lat = atoi(pj_optarg);
+            break;
+
+        case OPT_PLAYBACK_LAT:
+            cfg->playback_lat = atoi(pj_optarg);
             break;
 
@@ -1472 +1488 @@
     if (config->playback_dev != PJSUA_INVALID_ID) {
         pj_ansi_sprintf(line, "--playback-dev %d\n", config->playback_dev);
+        pj_strcat2(&cfg, line);
+    }
+
+    /* Sound device latency */
+    if (config->capture_lat != PJMEDIA_SND_DEFAULT_REC_LATENCY) {
+        pj_ansi_sprintf(line, "--capture-lat %d\n", config->capture_lat);
+        pj_strcat2(&cfg, line);
+    }
+    if (config->playback_dev != PJMEDIA_SND_DEFAULT_PLAY_LATENCY) {
+        pj_ansi_sprintf(line, "--playback-lat %d\n", config->playback_lat);
         pj_strcat2(&cfg, line);
     }
@@ -3714 +3740 @@
         goto on_error;
 
+    /* Set sound device latency */
+    pjmedia_snd_set_latency(app_config.capture_lat, app_config.playback_lat);
+
     /* Use null sound device? */
 #ifndef STEREO_DEMO