Changeset 2236 for pjproject/trunk/pjmedia/src/pjmedia/endpoint.c

Timestamp:

Aug 25, 2008 1:58:25 PM (16 years ago)

Author:

nanang

Message:

Ticket #599:

• Added "dec_fmtp" and "enc_fmtp" fields to pjmedia_codec_param.setting.
• Codec factory puts its default parameters in "dec_fmtp" field.
• pjmedia_stream_info_from_sdp() puts the "fmtp" attribute in SDP to pjmedia_codec_param.
• Special treatment for fmtp "bitrate" parameter (of G722.1) during SDP negotiation
• Added maxptime field in stream_info.
• Replaced iLBC's fmtp "mode" implementation to use general fmtp mechanism.
• Added some test scripts for G722.1 bitrate negotiation.

File:

• pjproject/trunk/pjmedia/src/pjmedia/endpoint.c (modified) (1 diff)

pjproject/trunk/pjmedia/src/pjmedia/endpoint.c

@@ -425 +425 @@
         }
 
-        /* Add fmtp mode where applicable */
-        if (codec_param.setting.dec_fmtp_mode != 0) {
-            const pj_str_t fmtp = { "fmtp", 4 };
+        /* Add fmtp params */
+        if (codec_param.setting.dec_fmtp.cnt > 0) {
+            enum { MAX_FMTP_STR_LEN = 160 };
+            char buf[MAX_FMTP_STR_LEN];
+            unsigned buf_len = 0, i;
+            pjmedia_codec_fmtp *dec_fmtp = &codec_param.setting.dec_fmtp;
+
+            /* Print codec PT */
+            buf_len += pj_ansi_snprintf(buf, 
+                                        MAX_FMTP_STR_LEN - buf_len, 
+                                        "%d", 
+                                        codec_info->pt);
+
+            for (i = 0; i < dec_fmtp->cnt; ++i) {
+                unsigned test_len = 2;
+
+                /* Check if buf still available */
+                test_len = dec_fmtp->param[i].val.slen + 
+                           dec_fmtp->param[i].name.slen;
+                if (test_len + buf_len >= MAX_FMTP_STR_LEN)
+                    return PJ_ETOOBIG;
+
+                /* Print delimiter */
+                buf_len += pj_ansi_snprintf(&buf[buf_len], 
+                                            MAX_FMTP_STR_LEN - buf_len,
+                                            (i == 0?" ":";"));
+
+                /* Print an fmtp param */
+                if (dec_fmtp->param[i].name.slen)
+                    buf_len += pj_ansi_snprintf(
+                                            &buf[buf_len],
+                                            MAX_FMTP_STR_LEN - buf_len,
+                                            "%.*s=%.*s",
+                                            (int)dec_fmtp->param[i].name.slen,
+                                            dec_fmtp->param[i].name.ptr,
+                                            (int)dec_fmtp->param[i].val.slen,
+                                            dec_fmtp->param[i].val.ptr);
+                else
+                    buf_len += pj_ansi_snprintf(&buf[buf_len], 
+                                            MAX_FMTP_STR_LEN - buf_len,
+                                            "%.*s", 
+                                            (int)dec_fmtp->param[i].val.slen,
+                                            dec_fmtp->param[i].val.ptr);
+            }
+
             attr = PJ_POOL_ZALLOC_T(pool, pjmedia_sdp_attr);
 
-            attr->name = fmtp;
-            attr->value.ptr = (char*) pj_pool_alloc(pool, 32);
-            attr->value.slen = 
-                pj_ansi_snprintf( attr->value.ptr, 32,
-                                  "%d mode=%d",
-                                  codec_info->pt,
-                                  codec_param.setting.dec_fmtp_mode);
+            attr->name = pj_str("fmtp");
+            attr->value = pj_strdup3(pool, buf);
             m->attr[m->attr_count++] = attr;
         }