Changeset 3573 for pjproject

Timestamp:

May 20, 2011 8:47:14 AM (13 years ago)

Author:

nanang

Message:

Fix #1235: fixed lock codec to check all active media (previously only checked one media: first active audio).

File:

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

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

@@ -3175 +3175 @@
     const pj_str_t STR_UPDATE = {"UPDATE", 6};
     const pjmedia_sdp_session *local_sdp = NULL, *new_sdp;
-    const pjmedia_sdp_media *ref_m;
-    pjmedia_sdp_media *m;
-    pjsua_call_media *call_med = &call->media[call->audio_idx];
-    unsigned i, codec_cnt = 0;
+    unsigned i;
     pj_bool_t rem_can_update;
+    pj_bool_t need_lock_codec = PJ_FALSE;
     pjsip_tx_data *tdata;
     pj_status_t status;
@@ -3211 +3209 @@
         return PJMEDIA_SDP_EINVER;
 
-    /* Verify if media is deactivated */
-    if (call_med->state == PJSUA_CALL_MEDIA_NONE ||
-        call_med->state == PJSUA_CALL_MEDIA_ERROR ||
-        call_med->dir == PJMEDIA_DIR_NONE)
-    {
-        return PJ_EINVALIDOP;
-    }
-
     PJ_LOG(3, (THIS_FILE, "Updating media session to use only one codec.."));
 
@@ -3226 +3216 @@
      */
     new_sdp = pjmedia_sdp_session_clone(call->inv->pool_prov, local_sdp);
-    m = new_sdp->media[call->audio_idx];
-    ref_m = local_sdp->media[call->audio_idx];
-    pj_assert(ref_m->desc.port);
-    codec_cnt = 0;
-    i = 0;
-    while (i < m->desc.fmt_count) {
-        pjmedia_sdp_attr *a;
-        pj_str_t *fmt = &m->desc.fmt[i];
-
-        if (is_non_av_fmt(m, fmt) || (++codec_cnt == 1)) {
-            ++i;
+
+    for (i = 0; i < call->med_cnt; ++i) {
+        unsigned j = 0, codec_cnt = 0;
+        const pjmedia_sdp_media *ref_m;
+        pjmedia_sdp_media *m;
+        pjsua_call_media *call_med = &call->media[i];
+
+        /* Verify if media is deactivated */
+        if (call_med->state == PJSUA_CALL_MEDIA_NONE ||
+            call_med->state == PJSUA_CALL_MEDIA_ERROR ||
+            call_med->dir == PJMEDIA_DIR_NONE)
+        {
             continue;
         }
 
-        /* Remove format */
-        a = pjmedia_sdp_attr_find2(m->attr_count, m->attr, "rtpmap", fmt);
-        if (a) pjmedia_sdp_attr_remove(&m->attr_count, m->attr, a);
-        a = pjmedia_sdp_attr_find2(m->attr_count, m->attr, "fmtp", fmt);
-        if (a) pjmedia_sdp_attr_remove(&m->attr_count, m->attr, a);
-        pj_array_erase(m->desc.fmt, sizeof(m->desc.fmt[0]),
-                       m->desc.fmt_count, i);
-        --m->desc.fmt_count;
+        ref_m = local_sdp->media[i];
+        m = new_sdp->media[i];
+
+        /* Verify that media must be active. */
+        pj_assert(ref_m->desc.port);
+
+        while (j < m->desc.fmt_count) {
+            pjmedia_sdp_attr *a;
+            pj_str_t *fmt = &m->desc.fmt[j];
+
+            if (is_non_av_fmt(m, fmt) || (++codec_cnt == 1)) {
+                ++j;
+                continue;
+            }
+
+            /* Remove format */
+            a = pjmedia_sdp_attr_find2(m->attr_count, m->attr, "rtpmap", fmt);
+            if (a) pjmedia_sdp_attr_remove(&m->attr_count, m->attr, a);
+            a = pjmedia_sdp_attr_find2(m->attr_count, m->attr, "fmtp", fmt);
+            if (a) pjmedia_sdp_attr_remove(&m->attr_count, m->attr, a);
+            pj_array_erase(m->desc.fmt, sizeof(m->desc.fmt[0]),
+                           m->desc.fmt_count, j);
+            --m->desc.fmt_count;
+        }
+        
+        need_lock_codec |= (ref_m->desc.fmt_count > m->desc.fmt_count);
     }
 
@@ -3254 +3263 @@
      * increase the SDP version (should not happen!).
      */
-    if (ref_m->desc.fmt_count == m->desc.fmt_count)
+    if (!need_lock_codec)
         return PJ_SUCCESS;
 
@@ -3302 +3311 @@
     pjsip_inv_session *inv = call->inv;
     const pjmedia_sdp_session *local_sdp, *remote_sdp;
-    const pjmedia_sdp_media *rem_m, *loc_m;
-    unsigned codec_cnt=0, i;
-    pjsua_call_media *call_med = &call->media[call->audio_idx];
     pj_time_val delay = {0, 0};
     const pj_str_t st_update = {"UPDATE", 6};
+    unsigned i;
+    pj_bool_t has_mult_fmt = PJ_FALSE;
     pj_status_t status;
 
@@ -3318 +3326 @@
     /* Skip this if we are the answerer */
     if (!inv->neg || !pjmedia_sdp_neg_was_answer_remote(inv->neg)) {
-        return PJ_SUCCESS;
-    }
-
-    /* Skip this if the media is inactive or error */
-    if (call_med->state == PJSUA_CALL_MEDIA_NONE ||
-        call_med->state == PJSUA_CALL_MEDIA_ERROR ||
-        call_med->dir == PJMEDIA_DIR_NONE)
-    {
         return PJ_SUCCESS;
     }
@@ -3347 +3347 @@
         return status;
 
-    PJ_ASSERT_RETURN(call->audio_idx>=0 &&
-                     call->audio_idx < (int)remote_sdp->media_count,
-                     PJ_EINVALIDOP);
-
-    rem_m = remote_sdp->media[call->audio_idx];
-    loc_m = local_sdp->media[call->audio_idx];
-
-    /* Verify that media must be active. */
-    pj_assert(loc_m->desc.port && rem_m->desc.port);
-
-    /* Count the formats in the answer. */
-    if (rem_m->desc.fmt_count==1) {
-        codec_cnt = 1;
-    } else {
-        for (i=0; i<rem_m->desc.fmt_count && codec_cnt <= 1; ++i) {
-            if (!is_non_av_fmt(rem_m, &rem_m->desc.fmt[i]))
-                ++codec_cnt;
-        }
-    }
-    if (codec_cnt <= 1) {
-        /* Answer contains single codec. */
-        call->lock_codec.retry_cnt = 0;
+    /* Find multiple codecs answer in all media */
+    for (i = 0; i < call->med_cnt; ++i) {
+        pjsua_call_media *call_med = &call->media[i];
+        const pjmedia_sdp_media *rem_m, *loc_m;
+        unsigned codec_cnt = 0;
+
+        /* Skip this if the media is inactive or error */
+        if (call_med->state == PJSUA_CALL_MEDIA_NONE ||
+            call_med->state == PJSUA_CALL_MEDIA_ERROR ||
+            call_med->dir == PJMEDIA_DIR_NONE)
+        {
+            continue;
+        }
+
+        /* Remote may answer with less media lines. */
+        if (i >= remote_sdp->media_count)
+            continue;
+
+        rem_m = remote_sdp->media[i];
+        loc_m = local_sdp->media[i];
+
+        /* Verify that media must be active. */
+        pj_assert(loc_m->desc.port && rem_m->desc.port);
+
+        /* Count the formats in the answer. */
+        if (rem_m->desc.fmt_count==1) {
+            codec_cnt = 1;
+        } else {
+            unsigned j;
+            for (j=0; j<rem_m->desc.fmt_count && codec_cnt <= 1; ++j) {
+                if (!is_non_av_fmt(rem_m, &rem_m->desc.fmt[j]))
+                    ++codec_cnt;
+            }
+        }
+
+        if (codec_cnt > 1) {
+            has_mult_fmt = PJ_TRUE;
+            break;
+        }
+    }
+
+    /* Each media in the answer already contains single codec. */
+    if (!has_mult_fmt) {
+        call->lock_codec.retry_cnt = 0;
         return PJ_SUCCESS;
     }