Changeset 3865 for pjproject/trunk

Timestamp:

Oct 26, 2011 4:57:05 PM (13 years ago)

Author:

nanang

Message:

Close #1403: Fixed pjsua-lib in generating re-offer when the current session contains (disabled) unknown media types.

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c (modified) (1 diff)

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

@@ -1943 +1943 @@
                     break;
                 default:
-                    if (rem_sdp) {
-                        pj_strdup(pool, &m->desc.media,
-                                  &rem_sdp->media[mi]->desc.media);
-                        pj_strdup(pool, &m->desc.fmt[0],
-                                  &rem_sdp->media[mi]->desc.fmt[0]);
-                    } else {
-                        pj_assert(!"Invalid call_med media type");
-                        return PJ_EBUG;
+                    /* This must be us generating re-offer, and some unknown
+                     * media may exist, so just clone from active local SDP
+                     * (and it should have been deactivated already).
+                     */
+                    pj_assert(call->inv && call->inv->neg &&
+                              sdp_neg_state == PJMEDIA_SDP_NEG_STATE_DONE);
+                    {
+                        const pjmedia_sdp_session *s_;
+                        pjmedia_sdp_neg_get_active_local(call->inv->neg, &s_);
+
+                        pj_assert(mi < s_->media_count);
+                        m = pjmedia_sdp_media_clone(pool, s_->media[mi]);
+                        m->desc.port = 0;
                     }
+                    break;
                 }
             }