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

Timestamp:

Jul 2, 2006 12:29:54 PM (17 years ago)

Author:

bennylp

Message:

Miscellaneous bug fix and improvements in PJMEDIA: (1) more stricker SDP parsing and validation, (2) fixed bug in RTCP attribute generation in SDP, (3) configurable telephone-event payload type

File:

• pjproject/trunk/pjmedia/src/pjmedia/endpoint.c (modified) (3 diffs)

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

@@ -333 +333 @@
 
     /* Add "rtcp" attribute */
-#if 1
+#if defined(PJMEDIA_HAS_RTCP_IN_SDP) && PJMEDIA_HAS_RTCP_IN_SDP!=0
     {
         attr = pj_pool_alloc(pool, sizeof(pjmedia_sdp_attr));
@@ -341 +341 @@
             pj_ansi_snprintf(attr->value.ptr, 80,
                             ":%u IN IP4 %s",
-                            pj_ntohs(sock_info[0].rtp_addr_name.sin_port),
-                            pj_inet_ntoa(sock_info[0].rtp_addr_name.sin_addr));
+                            pj_ntohs(sock_info[0].rtcp_addr_name.sin_port),
+                            pj_inet_ntoa(sock_info[0].rtcp_addr_name.sin_addr));
         pjmedia_sdp_attr_add(&m->attr_count, m->attr, attr);
     }
@@ -398 +398 @@
     m->attr[m->attr_count++] = attr;
 
-#if 1
+#if defined(PJMEDIA_RTP_PT_TELEPHONE_EVENTS) && \
+    PJMEDIA_RTP_PT_TELEPHONE_EVENTS != 0
+
     /*
      * Add support telephony event
      */
-    m->desc.fmt[m->desc.fmt_count++] = pj_str("101");
+    m->desc.fmt[m->desc.fmt_count++] = 
+        pj_str(PJMEDIA_RTP_PT_TELEPHONE_EVENTS_STR);
+
     /* Add rtpmap. */
     attr = pj_pool_zalloc(pool, sizeof(pjmedia_sdp_attr));
     attr->name = pj_str("rtpmap");
-    attr->value = pj_str(":101 telephone-event/8000");
+    attr->value = pj_str(":" PJMEDIA_RTP_PT_TELEPHONE_EVENTS_STR 
+                         " telephone-event/8000");
     m->attr[m->attr_count++] = attr;
+
     /* Add fmtp */
     attr = pj_pool_zalloc(pool, sizeof(pjmedia_sdp_attr));
     attr->name = pj_str("fmtp");
-    attr->value = pj_str(":101 0-15");
+    attr->value = pj_str(":" PJMEDIA_RTP_PT_TELEPHONE_EVENTS_STR " 0-15");
     m->attr[m->attr_count++] = attr;
 #endif