Changeset 4457 for pjproject

Timestamp:

Apr 3, 2013 8:21:47 AM (12 years ago)

Author:

bennylp

Message:

Fixed #1653: [incompatible] pjsua_call_update() API should not release hold

Location:

pjproject/trunk

Files:

• pjsip-apps/src/pjsua/pjsua_cli_cmd.c (modified) (1 diff)
• pjsip-apps/src/pjsua/pjsua_ui_cmd.c (modified) (2 diffs)
• pjsip/src/pjsua-lib/pjsua_call.c (modified) (1 diff)

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

@@ -1524 +1524 @@
 {
     if (current_call != PJSUA_INVALID_ID) {
+        call_opt.flag |= PJSUA_CALL_UNHOLD;
         pjsua_call_update2(current_call, &call_opt, NULL);
     } else {

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

@@ -971 +971 @@
 static void ui_send_update()
 {
-    if (current_call != -1) {           
+    if (current_call != -1) {
+        call_opt.flag |= PJSUA_CALL_UNHOLD;
         pjsua_call_update2(current_call, &call_opt, NULL);
     } else {
@@ -1936 +1937 @@
 on_exit:
     ;
-}
+} 
+

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

@@ -2496 +2496 @@
 
     /* Create SDP */
-    status = pjsua_media_channel_create_sdp(call->index, 
-                                            call->inv->pool_prov, 
-                                            NULL, &sdp, NULL);
-    if (status != PJ_SUCCESS) {
-        pjsua_perror(THIS_FILE, "Unable to get SDP from media endpoint", 
+    if (call->local_hold && (call->opt.flag & PJSUA_CALL_UNHOLD)==0) {
+        status = create_sdp_of_call_hold(call, &sdp);
+    } else {
+        status = pjsua_media_channel_create_sdp(call->index,
+                                                call->inv->pool_prov,
+                                                NULL, &sdp, NULL);
+        call->local_hold = PJ_FALSE;
+    }
+
+    if (status != PJ_SUCCESS) {
+        pjsua_perror(THIS_FILE, "Unable to get SDP from media endpoint",
                      status);
         goto on_return;