Changeset 1107

Timestamp:

Mar 27, 2007 10:53:57 AM (17 years ago)

Author:

bennylp

Message:

Fixed ticket #202: Fix telephone-event order in SDP (thanks Chris Hamilton)

Location:

pjproject/branches/pjproject-0.5-stable

Files:

• pjmedia/src/pjmedia/session.c (modified) (8 diffs)
• pjsip/src/pjsua-lib/pjsua_call.c (modified) (2 diffs)

pjproject/branches/pjproject-0.5-stable/pjmedia/src/pjmedia/session.c

@@ -126 +126 @@
     pjmedia_sdp_rtpmap *rtpmap;
     int local_fmtp_mode = 0, rem_fmtp_mode = 0;
-    unsigned i, pt;
+    unsigned i, pt, fmti;
     pj_status_t status;
 
@@ -249 +249 @@
 
 
-    /* And codec must be numeric! */
+    /* Get the payload number for receive channel. */
+    /*
+       Previously we used to rely on fmt[0] being the selected codec,
+       but some UA sends telephone-event as fmt[0] and this would
+       cause assert failure below.
+
+       Thanks Chris Hamilton <chamilton .at. cs.dal.ca> for this patch.
+
+    // And codec must be numeric!
     if (!pj_isdigit(*local_m->desc.fmt[0].ptr) || 
         !pj_isdigit(*rem_m->desc.fmt[0].ptr))
@@ -256 +264 @@
     }
 
-    /* Get the payload number for receive channel. */
     pt = pj_strtoul(&local_m->desc.fmt[0]);
     pj_assert(PJMEDIA_RTP_PT_TELEPHONE_EVENTS==0 ||
               pt != PJMEDIA_RTP_PT_TELEPHONE_EVENTS);
+    */
+
+    /* This is to suppress MSVC warning about uninitialized var */
+    pt = 0;
+
+    /* Find the first codec which is not telephone-event */
+    for ( fmti = 0; fmti < local_m->desc.fmt_count; ++fmti ) {
+        if ( !pj_isdigit(*local_m->desc.fmt[fmti].ptr) )
+            return PJMEDIA_EINVALIDPT;
+        pt = pj_strtoul(&local_m->desc.fmt[fmti]);
+        if ( PJMEDIA_RTP_PT_TELEPHONE_EVENTS == 0 ||
+                pt != PJMEDIA_RTP_PT_TELEPHONE_EVENTS )
+                break;
+    }
+    if ( fmti >= local_m->desc.fmt_count )
+        return PJMEDIA_EINVALIDPT;
 
     /* Get codec info.
@@ -272 +295 @@
 
         attr = pjmedia_sdp_media_find_attr(local_m, &ID_RTPMAP, 
-                                           &local_m->desc.fmt[0]);
+                                           &local_m->desc.fmt[fmti]);
         if (attr == NULL) {
             has_rtpmap = PJ_FALSE;
@@ -285 +308 @@
         if (has_rtpmap) {
             si->fmt.type = si->type;
-            si->fmt.pt = pj_strtoul(&local_m->desc.fmt[0]);
+            si->fmt.pt = pj_strtoul(&local_m->desc.fmt[fmti]);
             pj_strdup(pool, &si->fmt.encoding_name, &rtpmap->enc_name);
             si->fmt.clock_rate = rtpmap->clock_rate;
@@ -323 +346 @@
 
         attr = pjmedia_sdp_media_find_attr(local_m, &ID_RTPMAP, 
-                                           &local_m->desc.fmt[0]);
+                                           &local_m->desc.fmt[fmti]);
         if (attr == NULL)
             return PJMEDIA_EMISSINGRTPMAP;
@@ -334 +357 @@
 
         si->fmt.type = si->type;
-        si->fmt.pt = pj_strtoul(&local_m->desc.fmt[0]);
+        si->fmt.pt = pj_strtoul(&local_m->desc.fmt[fmti]);
         pj_strdup(pool, &si->fmt.encoding_name, &rtpmap->enc_name);
         si->fmt.clock_rate = rtpmap->clock_rate;
@@ -357 +380 @@
 
         /* Get fmtp mode= param in local SDP, if any */
-        get_fmtp_mode(local_m, &local_m->desc.fmt[0], &local_fmtp_mode);
+        get_fmtp_mode(local_m, &local_m->desc.fmt[fmti], &local_fmtp_mode);
 
         /* Determine payload type for outgoing channel, by finding

pjproject/branches/pjproject-0.5-stable/pjsip/src/pjsua-lib/pjsua_call.c

@@ -690 +690 @@
             pjsua_perror(THIS_FILE, "Error answering session", status);
 
+        /* Note that inv may be invalid if 200/OK has caused error in
+         * starting the media.
+         */
 
         PJ_LOG(4,(THIS_FILE, "Disconnecting replaced call %d",
@@ -1015 +1018 @@
         pjsip_dlg_dec_lock(dlg);
         return status;
+    }
+
+    /* Call might have been disconnected if application is answering with
+     * 200/OK and the media failed to start.
+     */
+    if (call->inv == NULL) {
+        pjsip_dlg_dec_lock(dlg);
+        return PJSIP_ESESSIONTERMINATED;
     }