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

Timestamp:

Jan 27, 2012 9:12:59 AM (12 years ago)

Author:

nanang

Message:

Re #1244: Added bandwidth info in SDP ("b=" lines) based on codec bitrate settings. Two SDP bandwidth types/modifiers are used: AS in session level & TIAS in media level.

File:

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

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

@@ -373 +373 @@
     pjmedia_sdp_attr *attr;
     unsigned i;
+    unsigned max_bitrate = 0;
     pj_status_t status;
 
@@ -494 +495 @@
             m->attr[m->attr_count++] = attr;
         }
+
+        /* Find maximum bitrate in this media */
+        if (max_bitrate < codec_param.info.max_bps)
+            max_bitrate = codec_param.info.max_bps;
     }
 
@@ -520 +525 @@
 #endif
 
+    /* Put bandwidth info in media level using bandwidth modifier "TIAS"
+     * (RFC3890).
+     */
+    if (max_bitrate) {
+        const pj_str_t STR_BANDW_MODIFIER = { "TIAS", 4 };
+        pjmedia_sdp_bandw *b;
+            
+        b = PJ_POOL_ALLOC_T(pool, pjmedia_sdp_bandw);
+        b->modifier = STR_BANDW_MODIFIER;
+        b->value = max_bitrate;
+        m->bandw[m->bandw_count++] = b;
+    }
+
     *p_m = m;
     return PJ_SUCCESS;
@@ -542 +560 @@
     pjmedia_sdp_attr *attr;
     unsigned cnt, i;
+    unsigned max_bitrate = 0;
     pj_status_t status;
 
@@ -569 +588 @@
         pjmedia_vid_codec_param codec_param;
         pj_str_t *fmt;
+        pjmedia_video_format_detail *vfd;
 
         pj_bzero(&rtpmap, sizeof(rtpmap));
@@ -661 +681 @@
             m->attr[m->attr_count++] = attr;
         }
+    
+        /* Find maximum bitrate in this media */
+        vfd = pjmedia_format_get_video_format_detail(&codec_param.enc_fmt,
+                                                     PJ_TRUE);
+        if (vfd && max_bitrate < vfd->max_bps)
+            max_bitrate = vfd->max_bps;
+    }
+
+    /* Put bandwidth info in media level using bandwidth modifier "TIAS"
+     * (RFC3890).
+     */
+    if (max_bitrate) {
+        const pj_str_t STR_BANDW_MODIFIER = { "TIAS", 4 };
+        pjmedia_sdp_bandw *b;
+            
+        b = PJ_POOL_ALLOC_T(pool, pjmedia_sdp_bandw);
+        b->modifier = STR_BANDW_MODIFIER;
+        b->value = max_bitrate;
+        m->bandw[m->bandw_count++] = b;
     }