Changeset 4240 for pjproject/trunk

Timestamp:

Aug 31, 2012 9:03:36 AM (12 years ago)

Author:

ming

Message:

Fixed #1577: Add pjmedia setting to include SDP bandwidth modifier "TIAS" (RFC3890)

Location:

pjproject/trunk/pjmedia

Files:

• include/pjmedia/config.h (modified) (1 diff)
• src/pjmedia/endpoint.c (modified) (3 diffs)

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

@@ -686 +686 @@
 
 /**
+ * This macro controls whether pjmedia should include SDP
+ * bandwidth modifier "TIAS" (RFC3890).
+ *
+ * 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_bandwidth_tias_in_sdp;
+
+    // Do not enable bandwidth information inclusion in sdp
+    pjmedia_add_bandwidth_tias_in_sdp = PJ_FALSE;
+ \endverbatim
+ *
+ * Default: 1 (yes)
+ */
+#ifndef PJMEDIA_ADD_BANDWIDTH_TIAS_IN_SDP
+#   define PJMEDIA_ADD_BANDWIDTH_TIAS_IN_SDP    1
+#endif
+
+
+/**
  * This macro controls whether pjmedia should include SDP rtpmap 
  * attribute for static payload types. SDP rtpmap for static

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

@@ -50 +50 @@
             PJMEDIA_ADD_RTPMAP_FOR_STATIC_PT;
 
+/* Config to control use of RFC3890 TIAS */
+pj_bool_t pjmedia_add_bandwidth_tias_in_sdp =
+            PJMEDIA_ADD_BANDWIDTH_TIAS_IN_SDP;
+
 
 
@@ -552 +556 @@
      * (RFC3890).
      */
-    if (max_bitrate) {
+    if (max_bitrate && pjmedia_add_bandwidth_tias_in_sdp) {
         const pj_str_t STR_BANDW_MODIFIER = { "TIAS", 4 };
         pjmedia_sdp_bandw *b;
@@ -716 +720 @@
      * (RFC3890).
      */
-    if (max_bitrate) {
+    if (max_bitrate && pjmedia_add_bandwidth_tias_in_sdp) {
         const pj_str_t STR_BANDW_MODIFIER = { "TIAS", 4 };
         pjmedia_sdp_bandw *b;