Changeset 1391

Timestamp:

Jun 26, 2007 8:59:49 AM (17 years ago)

Author:

bennylp

Message:

Ticket #342: added configuration to control whether SDP rtpmap should be included for static payload types (default still yes)

Location:

pjproject/trunk

Files:

• pjmedia/include/pjmedia/config.h (modified) (1 diff)
• pjmedia/src/pjmedia/endpoint.c (modified) (2 diffs)
• pjsip-apps/src/pjsua/pjsua_app.c (modified) (2 diffs)

pjproject/trunk/pjmedia/include/pjmedia/config.h

@@ -352 +352 @@
 
 /**
+ * This macro controls whether pjmedia should include SDP rtpmap 
+ * attribute for static payload types. SDP rtpmap for static
+ * payload types are optional, although they are normally included
+ * for interoperability reason.
+ *
+ * Note that there is also a run-time variable to turn this setting
+ * on or off, defined in endpoint.c. To access this variable, use
+ * the following construct
+ *
+ \verbatim
+    extern pj_bool_t pjmedia_add_rtpmap_for_static_pt;
+
+    // Do not include rtpmap for static payload types (<96)
+    pjmedia_add_rtpmap_for_static_pt = PJ_FALSE;
+ \endverbatim
+ *
+ * Default: 1 (yes)
+ */
+#ifndef PJMEDIA_ADD_RTPMAP_FOR_STATIC_PT
+#   define PJMEDIA_ADD_RTPMAP_FOR_STATIC_PT     1
+#endif
+
+
+/**
  * This macro declares the payload type for telephone-event
  * that is advertised by PJMEDIA for outgoing SDP. If this macro

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

@@ -46 +46 @@
 static int error_subsys_registered;
 
+/* Config to control rtpmap inclusion for static payload types */
+pj_bool_t pjmedia_add_rtpmap_for_static_pt = 
+            PJMEDIA_ADD_RTPMAP_FOR_STATIC_PT;
+
 
 /**
@@ -395 +399 @@
         }
 
-        pjmedia_sdp_rtpmap_to_attr(pool, &rtpmap, &attr);
-        m->attr[m->attr_count++] = attr;
+        if (codec_info->pt >= 96 || pjmedia_add_rtpmap_for_static_pt) {
+            pjmedia_sdp_rtpmap_to_attr(pool, &rtpmap, &attr);
+            m->attr[m->attr_count++] = attr;
+        }
 
         /* Add fmtp mode where applicable */

pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c

@@ -96 +96 @@
 #endif
 pj_status_t app_destroy(void);
-
-extern pj_bool_t pjsip_use_compact_form;
 
 /*****************************************************************************
@@ -2887 +2885 @@
     pj_status_t status;
 
-    //pjsip_use_compact_form = PJ_TRUE;
-
     /* Create pjsua */
     status = pjsua_create();