Changeset 3506

Timestamp:

Apr 7, 2011 7:53:25 AM (14 years ago)

Author:

bennylp

Message:

Re #1185: requesting call hold did not set video direction to sendonly

File:

• pjproject/branches/projects/2.0-dev/pjsip/src/pjsua-lib/pjsua_call.c (modified) (4 diffs)

pjproject/branches/projects/2.0-dev/pjsip/src/pjsua-lib/pjsua_call.c

@@ -2468 +2468 @@
             pjmedia_stream_get_info(stream, &info);
             pj_ansi_snprintf(codec_info, sizeof(codec_info), " %.*s @%dkHz",
-                             info.fmt.encoding_name.slen,
+                             (int)info.fmt.encoding_name.slen,
                              info.fmt.encoding_name.ptr,
                              info.fmt.clock_rate / 1000);
@@ -2486 +2486 @@
             pjmedia_vid_stream_get_info(stream, &info);
             pj_ansi_snprintf(codec_info, sizeof(codec_info), " %.*s",
-                             info.codec_info.encoding_name.slen,
+                             (int)info.codec_info.encoding_name.slen,
                              info.codec_info.encoding_name.ptr);
             if (call_med->dir & PJMEDIA_DIR_DECODING) {
@@ -3752 +3752 @@
                                            pjmedia_sdp_session *sdp)
 {
-    pjmedia_sdp_media *m;
+    unsigned mi;
 
     /* Call-hold is done by set the media direction to 'sendonly' 
@@ -3766 +3766 @@
      */
 
-    m = sdp->media[call->audio_idx];
-
-    if (call->call_hold_type == PJSUA_CALL_HOLD_TYPE_RFC2543) {
-        pjmedia_sdp_conn *conn;
-        pjmedia_sdp_attr *attr;
-
-        /* Get SDP media connection line */
-        conn = m->conn;
-        if (!conn)
-            conn = sdp->conn;
-
-        /* Modify address */
-        conn->addr = pj_str("0.0.0.0");
-
-        /* Remove existing directions attributes */
-        pjmedia_sdp_media_remove_all_attr(m, "sendrecv");
-        pjmedia_sdp_media_remove_all_attr(m, "sendonly");
-        pjmedia_sdp_media_remove_all_attr(m, "recvonly");
-        pjmedia_sdp_media_remove_all_attr(m, "inactive");
-
-        /* Add inactive attribute */
-        attr = pjmedia_sdp_attr_create(pool, "inactive", NULL);
-        pjmedia_sdp_media_add_attr(m, attr);
-
-
-    } else {
-        pjmedia_sdp_attr *attr;
-
-        /* Remove existing directions attributes */
-        pjmedia_sdp_media_remove_all_attr(m, "sendrecv");
-        pjmedia_sdp_media_remove_all_attr(m, "sendonly");
-        pjmedia_sdp_media_remove_all_attr(m, "recvonly");
-        pjmedia_sdp_media_remove_all_attr(m, "inactive");
-
-        if (call->media[call->audio_idx].dir & PJMEDIA_DIR_ENCODING) {
-            /* Add sendonly attribute */
-            attr = pjmedia_sdp_attr_create(pool, "sendonly", NULL);
-            pjmedia_sdp_media_add_attr(m, attr);
-        } else {
+    for (mi=0; mi<sdp->media_count; ++mi) {
+        pjmedia_sdp_media *m = sdp->media[mi];
+
+        if (call->call_hold_type == PJSUA_CALL_HOLD_TYPE_RFC2543) {
+            pjmedia_sdp_conn *conn;
+            pjmedia_sdp_attr *attr;
+
+            /* Get SDP media connection line */
+            conn = m->conn;
+            if (!conn)
+                conn = sdp->conn;
+
+            /* Modify address */
+            conn->addr = pj_str("0.0.0.0");
+
+            /* Remove existing directions attributes */
+            pjmedia_sdp_media_remove_all_attr(m, "sendrecv");
+            pjmedia_sdp_media_remove_all_attr(m, "sendonly");
+            pjmedia_sdp_media_remove_all_attr(m, "recvonly");
+            pjmedia_sdp_media_remove_all_attr(m, "inactive");
+
             /* Add inactive attribute */
             attr = pjmedia_sdp_attr_create(pool, "inactive", NULL);
             pjmedia_sdp_media_add_attr(m, attr);
+
+
+        } else {
+            pjmedia_sdp_attr *attr;
+
+            /* Remove existing directions attributes */
+            pjmedia_sdp_media_remove_all_attr(m, "sendrecv");
+            pjmedia_sdp_media_remove_all_attr(m, "sendonly");
+            pjmedia_sdp_media_remove_all_attr(m, "recvonly");
+            pjmedia_sdp_media_remove_all_attr(m, "inactive");
+
+            if (call->media[mi].dir & PJMEDIA_DIR_ENCODING) {
+                /* Add sendonly attribute */
+                attr = pjmedia_sdp_attr_create(pool, "sendonly", NULL);
+                pjmedia_sdp_media_add_attr(m, attr);
+            } else {
+                /* Add inactive attribute */
+                attr = pjmedia_sdp_attr_create(pool, "inactive", NULL);
+                pjmedia_sdp_media_add_attr(m, attr);
+            }
         }
     }