Changeset 3457 for pjproject/branches/projects/2.0-dev/pjsip/src/pjsua-lib/pjsua_core.c

Timestamp:

Mar 17, 2011 4:34:43 AM (13 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/src/pjsua-lib/pjsua_core.c (modified) (13 diffs)

pjproject/branches/projects/2.0-dev/pjsip/src/pjsua-lib/pjsua_core.c

@@ -104 +104 @@
     cfg->force_lr = PJ_TRUE;
     cfg->enable_unsolicited_mwi = PJ_TRUE;
-#if defined(PJMEDIA_HAS_SRTP) && (PJMEDIA_HAS_SRTP != 0)
     cfg->use_srtp = PJSUA_DEFAULT_USE_SRTP;
     cfg->srtp_secure_signaling = PJSUA_DEFAULT_SRTP_SECURE_SIGNALING;
-#endif
     cfg->hangup_forked_call = PJ_TRUE;
 
@@ -177 +175 @@
     cfg->ka_interval = 15;
     cfg->ka_data = pj_str("\r\n");
-#if defined(PJMEDIA_HAS_SRTP) && (PJMEDIA_HAS_SRTP != 0)
+    cfg->max_audio_cnt = 1;
+    pjsua_transport_config_default(&cfg->rtp_cfg);
     cfg->use_srtp = pjsua_var.ua_cfg.use_srtp;
     cfg->srtp_secure_signaling = pjsua_var.ua_cfg.srtp_secure_signaling;
     cfg->srtp_optional_dup_offer = pjsua_var.ua_cfg.srtp_optional_dup_offer;
-#endif
     cfg->reg_retry_interval = PJSUA_REG_RETRY_INTERVAL;
     cfg->contact_rewrite_method = PJSUA_CONTACT_REWRITE_METHOD;
@@ -224 +222 @@
 }
 
-
 /*****************************************************************************
  * This is a very simple PJSIP module, whose sole purpose is to display
@@ -379 +376 @@
 
     /* Get media socket info, make sure transport is ready */
+#if DISABLED_FOR_TICKET_1185
     if (pjsua_var.calls[0].med_tp) {
         pjmedia_transport_info_init(&tpinfo);
@@ -390 +388 @@
         }
     }
-
-    /* Send response statelessly */
+#endif
+
+    /* Send response */
     pjsip_get_response_addr(tdata->pool, rdata, &res_addr);
     status = pjsip_endpt_send_response(pjsua_var.endpt, &res_addr, tdata, NULL, NULL);
@@ -660 +659 @@
     PJ_ASSERT_RETURN(status == PJ_SUCCESS, status);
 
+    pjsua_set_state(PJSUA_STATE_CREATED);
 
     return PJ_SUCCESS;
@@ -919 +919 @@
                          pj_get_version(), PJ_OS_NAME));
 
+    pjsua_set_state(PJSUA_STATE_INIT);
+
     return PJ_SUCCESS;
 
@@ -1276 +1278 @@
     int i;  /* Must be signed */
 
+    if (pjsua_var.state > PJSUA_STATE_NULL &&
+        pjsua_var.state < PJSUA_STATE_CLOSING)
+    {
+        pjsua_set_state(PJSUA_STATE_CLOSING);
+    }
+
     /* Signal threads to quit: */
     pjsua_var.thread_quit_flag = 1;
@@ -1453 +1461 @@
     pj_bzero(&pjsua_var, sizeof(pjsua_var));
 
+    pjsua_set_state(PJSUA_STATE_NULL);
+
     /* Done. */
     return PJ_SUCCESS;
 }
 
+void pjsua_set_state(pjsua_state new_state)
+{
+    const char *state_name[] = {
+        "NULL",
+        "CREATED",
+        "INIT",
+        "STARTING",
+        "RUNNING",
+        "CLOSING"
+    };
+    pjsua_state old_state = pjsua_var.state;
+
+    pjsua_var.state = new_state;
+    PJ_LOG(4,(THIS_FILE, "PJSUA state changed: %s --> %s",
+              state_name[old_state], state_name[new_state]));
+}
+
+/* Get state */
+PJ_DEF(pjsua_state) pjsua_get_state(void)
+{
+    return pjsua_var.state;
+}
 
 /**
@@ -1469 +1501 @@
     pj_status_t status;
 
+    pjsua_set_state(PJSUA_STATE_STARTING);
+
     status = pjsua_call_subsys_start();
     if (status != PJ_SUCCESS)
@@ -1480 +1514 @@
     if (status != PJ_SUCCESS)
         return status;
+
+    pjsua_set_state(PJSUA_STATE_RUNNING);
 
     return PJ_SUCCESS;
@@ -2564 +2600 @@
 
     PJ_LOG(3,(THIS_FILE, "Dumping media transports:"));
+#if DISABLED_FOR_TICKET_1185
     for (i=0; i<pjsua_var.ua_cfg.max_calls; ++i) {
         pjsua_call *call = &pjsua_var.calls[i];
@@ -2580 +2617 @@
                                     sizeof(addr_buf), 3)));
     }
+#endif
 
     pjsip_tsx_layer_dump(detail);