Changeset 2191 for pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c

Timestamp:

Aug 4, 2008 3:01:38 PM (16 years ago)

Author:

nanang

Message:

Ticket #563: Updated SDP offer/answer related to call hold scenario to conform to RFC 3264 section 8.4 (before: 'a=inactive' and 'c=0.0.0.0', now: 'a=sendonly' and muted ports).

File:

• pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c (modified) (2 diffs)

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

@@ -2211 +2211 @@
     ring_stop(call_id);
 
-    if (call_info.media_status == PJSUA_CALL_MEDIA_ACTIVE) {
+    /* Connect ports appropriately when media status is ACTIVE or REMOTE HOLD,
+     * otherwise we should NOT connect the ports.
+     */
+    if (call_info.media_status == PJSUA_CALL_MEDIA_ACTIVE ||
+        call_info.media_status == PJSUA_CALL_MEDIA_REMOTE_HOLD)
+    {
         pj_bool_t connect_sound = PJ_TRUE;
 
@@ -2279 +2284 @@
             }
         }
-
+    }
+
+    /* Handle media status */
+    switch (call_info.media_status) {
+    case PJSUA_CALL_MEDIA_ACTIVE:
         PJ_LOG(3,(THIS_FILE, "Media for call %d is active", call_id));
-
-    } else if (call_info.media_status == PJSUA_CALL_MEDIA_LOCAL_HOLD) {
+        break;
+
+    case PJSUA_CALL_MEDIA_LOCAL_HOLD:
         PJ_LOG(3,(THIS_FILE, "Media for call %d is suspended (hold) by local",
                   call_id));
-    } else if (call_info.media_status == PJSUA_CALL_MEDIA_REMOTE_HOLD) {
+        break;
+
+    case PJSUA_CALL_MEDIA_REMOTE_HOLD:
         PJ_LOG(3,(THIS_FILE, 
                   "Media for call %d is suspended (hold) by remote",
                   call_id));
-    } else if (call_info.media_status == PJSUA_CALL_MEDIA_ERROR) {
-        pj_str_t reason = pj_str("ICE negotiation failed");
-
-        PJ_LOG(1,(THIS_FILE,
+        break;
+
+    case PJSUA_CALL_MEDIA_ERROR:
+        PJ_LOG(3,(THIS_FILE,
                   "Media has reported error, disconnecting call"));
-
-        pjsua_call_hangup(call_id, 500, &reason, NULL);
-
-    } else {
+        {
+            pj_str_t reason = pj_str("ICE negotiation failed");
+            pjsua_call_hangup(call_id, 500, &reason, NULL);
+        }
+        break;
+
+    case PJSUA_CALL_MEDIA_NONE:
         PJ_LOG(3,(THIS_FILE, 
                   "Media for call %d is inactive",
                   call_id));
+        break;
+
+    default:
+        pj_assert(!"Unhandled media status");
+        break;
     }
 }