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

Timestamp:

Jun 19, 2006 2:49:14 PM (18 years ago)

Author:

bennylp

Message:

Re-live --quality options in pjsua

File:

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

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

@@ -44 +44 @@
     unsigned                codec_cnt;
     pj_str_t                codec_arg[32];
-    unsigned                clock_rate;
     pj_bool_t               null_audio;
     pj_str_t                wav_file;
@@ -52 +51 @@
     pj_bool_t               auto_loop;
     unsigned                ptime;
-    unsigned                quality;
-    unsigned                complexity;
     unsigned                auto_answer;
     unsigned                duration;
@@ -113 +110 @@
     puts  ("  --auto-loop         Automatically loop incoming RTP to outgoing RTP");
     puts  ("  --rtp-port=N        Base port to try for RTP (default=4000)");
+    puts  ("  --quality=N         Specify media quality (0-10, default=10)");
     /*
-    puts  ("  --complexity=N      Specify encoding complexity (0-10, default=none(-1))");
-    puts  ("  --quality=N         Specify encoding quality (0-10, default=4)");
     puts  ("  --ptime=MSEC        Override codec ptime to MSEC (default=specific)");
     */
@@ -562 +558 @@
             break;
 
-        case OPT_QUALITY:
-            cfg->quality = my_atoi(pj_optarg);
-            if (cfg->quality < 0 || cfg->quality > 10) {
-                PJ_LOG(1,(THIS_FILE,
-                          "Error: invalid --quality (expecting 0-10"));
-                return -1;
-            }
-            break;
-
         case OPT_DURATION:
             cfg->duration = my_atoi(pj_optarg);
@@ -585 +572 @@
 
         */
+
+        case OPT_QUALITY:
+            cfg->media_cfg.quality = my_atoi(pj_optarg);
+            if (cfg->media_cfg.quality < 0 || cfg->media_cfg.quality > 10) {
+                PJ_LOG(1,(THIS_FILE,
+                          "Error: invalid --quality (expecting 0-10"));
+                return -1;
+            }
+            break;
 
         case OPT_AUTO_ANSWER:
@@ -832 +828 @@
     }
     /* Media clock rate. */
-    if (config->clock_rate) {
+    if (config->media_cfg.clock_rate) {
         pj_ansi_sprintf(line, "--clock-rate %d\n",
-                        config->clock_rate);
+                        config->media_cfg.clock_rate);
         pj_strcat2(&cfg, line);
     }
-
-
-    /* Encoding quality and complexity */
-    if (config->quality > 0) {
+    if (config->media_cfg.quality != 10) {
         pj_ansi_sprintf(line, "--quality %d\n",
-                        config->quality);
+                        config->media_cfg.quality);
         pj_strcat2(&cfg, line);
     }
-    if (config->complexity > 0) {
-        pj_ansi_sprintf(line, "--complexity %d\n",
-                        config->complexity);
-        pj_strcat2(&cfg, line);
-    }
+
 
     /* ptime */