Changeset 3457 for pjproject/branches/projects/2.0-dev/pjsip-apps/src/pjsua/pjsua_app.c

Timestamp:

Mar 17, 2011 4:34:43 AM (14 years ago)

Author:

bennylp

Message:

Modifications in PJSUA-LIB to support multiple media streams (multiple audio and/or video) and dynamic creation of media transports. This closed #1185 and closed #1201.

1185: Dynamic creation of media transports
============================================
Done:

• media transports are created on demand now

Todo:

• media transport creation is still blocking

1201: Video support in PJSUA-LIB
===================================
Done:

• call now supports N media (N audio and M video)
• number of audio/video streams is configurable per acc
• extra audio stream info in pjsua_call_info to support multiple audio streams

in one call

• video subsys and ffmpeg initialization in PJSUA-LIB
• ability to offer and create video SDP answer
• "dq" for more than 1 audio streams
• introducing pjsua_state and pjsua_get_state()

API change:

• on_stream_created() and on_stream_destroyed() callbacks: changed session to

stream

Todo:

• many others features are disabled, just search for DISABLED_FOR_TICKET_1185

macro (these have also been added to ticket #1193 (Issues & Todos)). Notable
missing features are:

• creation of duplicate SDP m= lines for optional SRTP
• mm.. that's it?

• whole lot of testings

pjsua:
===============

• Added --extra-audio and --video options. Specify these more than once and

each time an extra audio/video streams will be added. :)

File:

• pjproject/branches/projects/2.0-dev/pjsip-apps/src/pjsua/pjsua_app.c (modified) (10 diffs)

pjproject/branches/projects/2.0-dev/pjsip-apps/src/pjsua/pjsua_app.c

@@ -268 +268 @@
 
     puts  ("");
-    puts  ("Media Options:");
+    puts  ("Audio Options:");
     puts  ("  --add-codec=name    Manually add codec (default is to enable all)");
     puts  ("  --dis-codec=name    Disable codec (can be specified multiple times)");
@@ -302 +302 @@
     puts  ("  --no-tones          Disable audible tones");
     puts  ("  --jb-max-size       Specify jitter buffer maximum size, in frames (default=-1)");
+    puts  ("  --extra-audio       Add one more audio stream");
+
+    puts  ("");
+    puts  ("Video Options:");
+    puts  ("  --video             Enable video");
 
     puts  ("");
@@ -541 +546 @@
            OPT_AUTO_UPDATE_NAT,OPT_USE_COMPACT_FORM,OPT_DIS_CODEC,
            OPT_NO_FORCE_LR,
-           OPT_TIMER, OPT_TIMER_SE, OPT_TIMER_MIN_SE
+           OPT_TIMER, OPT_TIMER_SE, OPT_TIMER_MIN_SE,
+           OPT_VIDEO, OPT_EXTRA_AUDIO
     };
     struct pj_getopt_option long_options[] = {
@@ -660 +666 @@
         { "timer-min-se", 1, 0, OPT_TIMER_MIN_SE},
         { "outb-rid",   1, 0, OPT_OUTB_RID},
+        { "video",      0, 0, OPT_VIDEO},
+        { "extra-audio",0, 0, OPT_EXTRA_AUDIO},
         { NULL, 0, 0, 0}
     };
@@ -1416 +1424 @@
             cfg->udp_cfg.qos_params.flags = PJ_QOS_PARAM_HAS_DSCP;
             cfg->udp_cfg.qos_params.dscp_val = 0x18;
+            break;
+        case OPT_VIDEO:
+            ++cur_acc->max_video_cnt;
+            break;
+        case OPT_EXTRA_AUDIO:
+            ++cur_acc->max_audio_cnt;
             break;
         default:
@@ -1661 +1675 @@
     if (acc_cfg->mwi_enabled)
         pj_strcat2(result, "--mwi\n");
+
+    /* Video & extra audio */
+    for (i=0; i<acc_cfg->max_video_cnt; ++i) {
+        pj_strcat2(result, "--video\n");
+    }
+    for (i=1; i<acc_cfg->max_audio_cnt; ++i) {
+        pj_strcat2(result, "--extra-audio\n");
+    }
 }
 
@@ -3892 +3914 @@
                 acc_cfg.cred_info[0].data = pj_str(passwd);
 
+                acc_cfg.rtp_cfg = app_config.rtp_cfg;
+
                 status = pjsua_acc_add(&acc_cfg, PJ_TRUE, NULL);
                 if (status != PJ_SUCCESS) {
@@ -4929 +4953 @@
     /* Add accounts */
     for (i=0; i<app_config.acc_cnt; ++i) {
+        app_config.acc_cfg[i].rtp_cfg = app_config.rtp_cfg;
         status = pjsua_acc_add(&app_config.acc_cfg[i], PJ_TRUE, NULL);
         if (status != PJ_SUCCESS)
@@ -4960 +4985 @@
     if (app_config.ipv6)
         status = create_ipv6_media_transports();
+  #if DISABLED_FOR_TICKET_1185
     else
         status = pjsua_media_transports_create(&app_config.rtp_cfg);
+  #endif
 #endif
     if (status != PJ_SUCCESS)
@@ -5296 +5323 @@
     }
 
+#if DISABLED_FOR_TICKET_1185
     return pjsua_media_transports_attach(tp, i, PJ_TRUE);
-}
-
+#else
+    return PJ_ENOTSUP;
+#endif
+}
+