Changeset 4930 for pjproject/trunk/pjmedia/src/pjmedia/stream_info.c

Timestamp:

Sep 24, 2014 10:30:57 AM (10 years ago)

Author:

nanang

Message:

Fix #1794: Fixed assertion or garbled audio in call using G.722.1:

• Updated stream info to use pjmedia_sdp_neg_fmt_match() for matching formats in SDP, so it will call codec specific match function, e.g: for G.722.1 it will match the bitrate too.
• Workaround for 'stream uses wrong codec param for opening G.722.1' issue, it is the G.722.1 codec that check the SDP fmtp for fetching bitrate setting (instead of using avg_bps/max_bps fields in codec param).

File:

• pjproject/trunk/pjmedia/src/pjmedia/stream_info.c (modified) (2 diffs)

pjproject/trunk/pjmedia/src/pjmedia/stream_info.c

@@ -19 +19 @@
  */
 #include <pjmedia/stream.h>
+#include <pjmedia/sdp_neg.h>
 #include <pjmedia/stream_common.h>
 #include <pj/ctype.h>
@@ -189 +190 @@
         si->tx_pt = 0xFFFF;
         for (i=0; i<rem_m->desc.fmt_count; ++i) {
-            unsigned rpt;
-            pjmedia_sdp_attr *r_attr;
-            pjmedia_sdp_rtpmap r_rtpmap;
-
-            rpt = pj_strtoul(&rem_m->desc.fmt[i]);
-            if (rpt < 96)
-                continue;
-
-            r_attr = pjmedia_sdp_media_find_attr(rem_m, &ID_RTPMAP,
-                                                 &rem_m->desc.fmt[i]);
-            if (!r_attr)
-                continue;
-
-            if (pjmedia_sdp_attr_get_rtpmap(r_attr, &r_rtpmap) != PJ_SUCCESS)
-                continue;
-
-            if (!pj_stricmp(&rtpmap->enc_name, &r_rtpmap.enc_name) &&
-                rtpmap->clock_rate == r_rtpmap.clock_rate)
+            if (pjmedia_sdp_neg_fmt_match(pool,
+                                          (pjmedia_sdp_media*)local_m, fmti,
+                                          (pjmedia_sdp_media*)rem_m, i, 0) ==
+                PJ_SUCCESS)
             {
                 /* Found matched codec. */
-                si->tx_pt = rpt;
-
+                si->tx_pt = pj_strtoul(&rem_m->desc.fmt[i]);
                 break;
             }