Changeset 4930 for pjproject

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).

Location:

pjproject/trunk/pjmedia/src

Files:

• pjmedia-codec/g7221.c (modified) (3 diffs)
• pjmedia/stream_info.c (modified) (2 diffs)

pjproject/trunk/pjmedia/src/pjmedia-codec/g7221.c

@@ -649 +649 @@
     codec_private_t *codec_data = (codec_private_t*) codec->codec_data;
     pj_pool_t *pool;
+    pjmedia_codec_fmtp *fmtp = &attr->setting.dec_fmtp;
+    pj_uint16_t fmtp_bitrate = 0;
     unsigned tmp;
 
+    for (tmp = 0; tmp < fmtp->cnt && !fmtp_bitrate; ++tmp) {
+        if (!pj_strcmp2(&fmtp->param[tmp].name, "bitrate"))
+            fmtp_bitrate = (pj_uint16_t)pj_strtoul(&fmtp->param[tmp].val);
+    }
+
     /* Validation mode first! */
-    if (!validate_mode(attr->info.clock_rate, attr->info.avg_bps))
+    if (!fmtp_bitrate || !validate_mode(attr->info.clock_rate, fmtp_bitrate))
         return PJMEDIA_CODEC_EINMODE;
 
@@ -661 +668 @@
     codec_data->plc_enabled = (attr->setting.plc != 0);
 
-    codec_data->bitrate = (pj_uint16_t)attr->info.avg_bps;
-    codec_data->frame_size_bits = (pj_uint16_t)(attr->info.avg_bps*20/1000);
+    codec_data->bitrate = fmtp_bitrate;
+    codec_data->frame_size_bits = fmtp_bitrate*20/1000;
     codec_data->frame_size = (pj_uint16_t)(codec_data->frame_size_bits>>3);
     codec_data->samples_per_frame = (pj_uint16_t)
@@ -687 +694 @@
     codec_data->dec_randobj.seed2 = 1;
     codec_data->dec_randobj.seed3 = 1;
+
+    /* Update codec param */
+    attr->info.avg_bps = attr->info.max_bps = fmtp_bitrate;
 
     return PJ_SUCCESS;

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;
             }