Changeset 2191 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.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/src/pjsua-lib/pjsua_media.c (modified) (2 diffs)

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

@@ -1232 +1232 @@
         pj_memcpy(&sess_info.stream_info[0], si, sizeof(pjmedia_stream_info));
 
-    /* Check if media is put on-hold */
+    /* Check if no media is active */
     if (sess_info.stream_cnt == 0 || si->dir == PJMEDIA_DIR_NONE)
     {
-
-        /* Determine who puts the call on-hold */
-        if (prev_media_st == PJSUA_CALL_MEDIA_ACTIVE) {
-            if (pjmedia_sdp_neg_was_answer_remote(call->inv->neg)) {
-                /* It was local who offer hold */
-                call->media_st = PJSUA_CALL_MEDIA_LOCAL_HOLD;
-            } else {
-                call->media_st = PJSUA_CALL_MEDIA_REMOTE_HOLD;
-            }
-        }
-
+        /* Call media state */
+        call->media_st = PJSUA_CALL_MEDIA_NONE;
+
+        /* Call media direction */
         call->media_dir = PJMEDIA_DIR_NONE;
 
@@ -1368 +1361 @@
         }
 
-        /* Call's media state is active */
-        call->media_st = PJSUA_CALL_MEDIA_ACTIVE;
+        /* Call media direction */
         call->media_dir = si->dir;
+
+        /* Call media state */
+        if (call->local_hold)
+            call->media_st = PJSUA_CALL_MEDIA_LOCAL_HOLD;
+        else if (call->media_dir == PJMEDIA_DIR_DECODING)
+            call->media_st = PJSUA_CALL_MEDIA_REMOTE_HOLD;
+        else
+            call->media_st = PJSUA_CALL_MEDIA_ACTIVE;
     }