Changeset 343 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_settings.c

Timestamp:

Mar 20, 2006 5:42:37 PM (18 years ago)

Author:

bennylp

Message:

Added clock-rate options in pjsua

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_settings.c (modified) (6 diffs)

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

@@ -87 +87 @@
     puts  ("  --wb                Enable wideband codecs and set clock-rate to 16KHz");
     puts  ("  --uwb               Enable ultra-wideband codecs and set clock-rate to 32KHz");
+    puts  ("  --clock-rate=N      Override sound device clock rate");
     puts  ("  --null-audio        Use NULL audio device");
     puts  ("  --no-mic            Disable microphone device");
@@ -227 +228 @@
            OPT_ADD_BUDDY, OPT_OFFER_X_MS_MSG, OPT_NO_PRESENCE,
            OPT_AUTO_ANSWER, OPT_AUTO_HANGUP, OPT_AUTO_PLAY, OPT_AUTO_LOOP,
-           OPT_AUTO_CONF,
+           OPT_AUTO_CONF, OPT_CLOCK_RATE,
            OPT_PLAY_FILE, OPT_WB, OPT_UWB, OPT_RTP_PORT, OPT_ADD_CODEC,
            OPT_COMPLEXITY, OPT_QUALITY,
@@ -242 +243 @@
         { "wb",         0, 0, OPT_WB},
         { "uwb",        0, 0, OPT_UWB},
+        { "clock-rate", 1, 0, OPT_CLOCK_RATE},
         { "null-audio", 0, 0, OPT_NULL_AUDIO},
         { "no-mic",     0, 0, OPT_NO_MIC},
@@ -352 +354 @@
 
         case OPT_WB:
-            pjsua.clock_rate = 16000;
+            pjsua.has_wb = 1;
             break;
 
         case OPT_UWB:
-            pjsua.clock_rate = 32000;
+            pjsua.has_uwb = 1;
+            break;
+
+        case OPT_CLOCK_RATE:
+            lval = pj_strtoul(pj_cstr(&tmp, pj_optarg));
+            if (lval < 8000 || lval > 48000) {
+                printf("Error: expecting value between 8000-48000 for clock rate\n");
+                return PJ_EINVAL;
+            }
+            pjsua.clock_rate = (int)lval; 
             break;
 
@@ -573 +584 @@
         return PJ_EINVAL;
     }
+
+    /* Adjust clock rate */
+    if (pjsua.clock_rate == 8000 && pjsua.has_uwb)
+        pjsua.clock_rate = 32000;
+    else if (pjsua.clock_rate == 8000 && pjsua.has_wb)
+        pjsua.clock_rate = 16000;
 
     return PJ_SUCCESS;
@@ -906 +923 @@
     }
     /* Media clock rate. */
-    if (pjsua.clock_rate >= 32000)
+    if (pjsua.has_uwb)
         pj_strcat2(&cfg, "--uwb\n");
-    else if (pjsua.clock_rate >= 16000)
+
+    if (pjsua.has_wb)
         pj_strcat2(&cfg, "--wb\n");
+
+    pj_ansi_sprintf(line, "--clock-rate %d\n",
+                    pjsua.clock_rate);
+    pj_strcat2(&cfg, line);
+
 
     /* Encoding quality and complexity */