Changeset 3664 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_core.c

Timestamp:

Jul 19, 2011 3:42:28 AM (13 years ago)

Author:

nanang

Message:

Re #1326: Initial code integration from branch 2.0-dev to trunk as "2.0-pre-alpha-svn".

Location:

pjproject/trunk

Files:

• . (modified) (1 prop)
• pjsip/src/pjsua-lib/pjsua_core.c (modified) (16 diffs)

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

@@ -68 +68 @@
 
     pjsua_config_default(&pjsua_var.ua_cfg);
+
+    for (i=0; i<PJSUA_MAX_VID_WINS; ++i) {
+        pjsua_vid_win_reset(i);
+    }
 }
 
@@ -104 +108 @@
     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;
 
@@ -178 +180 @@
     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;
+    cfg->vid_cap_dev = PJMEDIA_VID_DEFAULT_CAPTURE_DEV;
+    cfg->vid_rend_dev = PJMEDIA_VID_DEFAULT_RENDER_DEV;
+    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;
@@ -226 +230 @@
 }
 
-
 /*****************************************************************************
  * This is a very simple PJSIP module, whose sole purpose is to display
@@ -381 +384 @@
 
     /* 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);
@@ -392 +396 @@
         }
     }
-
-    /* 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);
@@ -638 +643 @@
     pjsua_var.play_dev = PJMEDIA_AUD_DEFAULT_PLAYBACK_DEV;
 
+    /* Set default video device ID */
+    pjsua_var.vcap_dev = PJMEDIA_VID_DEFAULT_CAPTURE_DEV;
+    pjsua_var.vrdr_dev = PJMEDIA_VID_DEFAULT_RENDER_DEV;
+
     /* Init caching pool. */
     pj_caching_pool_init(&pjsua_var.cp, NULL, 0);
@@ -662 +671 @@
     PJ_ASSERT_RETURN(status == PJ_SUCCESS, status);
 
+    pjsua_set_state(PJSUA_STATE_CREATED);
 
     return PJ_SUCCESS;
@@ -930 +940 @@
                          pj_get_version(), pj_get_sys_info()->info.ptr));
 
+    pjsua_set_state(PJSUA_STATE_INIT);
+
     return PJ_SUCCESS;
 
@@ -1287 +1299 @@
     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;
@@ -1449 +1467 @@
         pj_caching_pool_destroy(&pjsua_var.cp);
 
+        pjsua_set_state(PJSUA_STATE_NULL);
+
         PJ_LOG(4,(THIS_FILE, "PJSUA destroyed..."));
 
@@ -1468 +1488 @@
 }
 
+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;
+}
 
 /**
@@ -1480 +1522 @@
     pj_status_t status;
 
+    pjsua_set_state(PJSUA_STATE_STARTING);
+
     status = pjsua_call_subsys_start();
     if (status != PJ_SUCCESS)
@@ -1491 +1535 @@
     if (status != PJ_SUCCESS)
         return status;
+
+    pjsua_set_state(PJSUA_STATE_RUNNING);
 
     return PJ_SUCCESS;
@@ -2575 +2621 @@
 
     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];
@@ -2591 +2638 @@
                                     sizeof(addr_buf), 3)));
     }
+#endif
 
     pjsip_tsx_layer_dump(detail);