Changeset 5918 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c

Timestamp:

Dec 4, 2018 2:16:47 AM (6 years ago)

Author:

ming

Message:

Fixed #2165: Support video only call in pjsua

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c (modified) (3 diffs)

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

@@ -788 +788 @@
     PJSUA_LOCK();
 
+    acc = &pjsua_var.acc[acc_id];
+    if (!acc->valid) {
+        pjsua_perror(THIS_FILE, "Unable to make call because account "
+                     "is not valid", PJ_EINVALIDOP);
+        status = PJ_EINVALIDOP;
+        goto on_error;
+    }
+
+    /* Find free call slot. */
+    call_id = alloc_call_id();
+
+    if (call_id == PJSUA_INVALID_ID) {
+        pjsua_perror(THIS_FILE, "Error making call", PJ_ETOOMANY);
+        status = PJ_ETOOMANY;
+        goto on_error;
+    }
+
+    /* Clear call descriptor */
+    reset_call(call_id);
+
+    call = &pjsua_var.calls[call_id];
+
+    /* Associate session with account */
+    call->acc_id = acc_id;
+    call->call_hold_type = acc->cfg.call_hold_type;
+
+    /* Generate per-session RTCP CNAME, according to RFC 7022. */
+    pj_create_random_string(call->cname_buf, call->cname.slen);
+
+    /* Apply call setting */
+    status = apply_call_setting(call, opt, NULL);
+    if (status != PJ_SUCCESS) {
+        pjsua_perror(THIS_FILE, "Failed to apply call setting", status);
+        goto on_error;
+    }
+    
     /* Create sound port if none is instantiated, to check if sound device
      * can be used. But only do this with the conference bridge, as with
@@ -794 +830 @@
      */
     if (!pjsua_var.is_mswitch && pjsua_var.snd_port==NULL &&
-        pjsua_var.null_snd==NULL && !pjsua_var.no_snd)
+        pjsua_var.null_snd==NULL && !pjsua_var.no_snd && call->opt.aud_cnt > 0)
     {
         status = pjsua_set_snd_dev(pjsua_var.cap_dev, pjsua_var.play_dev);
@@ -801 +837 @@
     }
 
-    acc = &pjsua_var.acc[acc_id];
-    if (!acc->valid) {
-        pjsua_perror(THIS_FILE, "Unable to make call because account "
-                     "is not valid", PJ_EINVALIDOP);
-        status = PJ_EINVALIDOP;
-        goto on_error;
-    }
-
-    /* Find free call slot. */
-    call_id = alloc_call_id();
-
-    if (call_id == PJSUA_INVALID_ID) {
-        pjsua_perror(THIS_FILE, "Error making call", PJ_ETOOMANY);
-        status = PJ_ETOOMANY;
-        goto on_error;
-    }
-
-    /* Clear call descriptor */
-    reset_call(call_id);
-
-    call = &pjsua_var.calls[call_id];
-
-    /* Associate session with account */
-    call->acc_id = acc_id;
-    call->call_hold_type = acc->cfg.call_hold_type;
-
-    /* Generate per-session RTCP CNAME, according to RFC 7022. */
-    pj_create_random_string(call->cname_buf, call->cname.slen);
-
-    /* Apply call setting */
-    status = apply_call_setting(call, opt, NULL);
-    if (status != PJ_SUCCESS) {
-        pjsua_perror(THIS_FILE, "Failed to apply call setting", status);
-        goto on_error;
-    }
-    
     /* Create temporary pool */
     tmp_pool = pjsua_pool_create("tmpcall10", 512, 256);