Changeset 3945 for pjproject/trunk/pjmedia/src/pjmedia/sdp.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/sdp.c (modified) (6 diffs)

pjproject/trunk/pjmedia/src/pjmedia/sdp.c

@@ -60 +60 @@
 static void parse_connection_info(pj_scanner *scanner, pjmedia_sdp_conn *conn,
                                   parse_context *ctx);
+static void parse_bandwidth_info(pj_scanner *scanner, pjmedia_sdp_bandw *bandw,
+                                  parse_context *ctx);
 static pjmedia_sdp_attr *parse_attr(pj_pool_t *pool, pj_scanner *scanner,
                                     parse_context *ctx);
@@ -811 +813 @@
     }
 
+    /* print optional bandwidth info. */
+    for (i=0; i<ses->bandw_count; ++i) {
+        printed = print_bandw(ses->bandw[i], p, end-p);
+        if (printed < 1) {
+            return -1;
+        }
+        p += printed;
+    }
 
     /* Time */
@@ -987 +997 @@
     pj_scan_get_until_chr(scanner, "/ \t\r\n", &conn->addr);
     PJ_TODO(PARSE_SDP_CONN_ADDRESS_SUBFIELDS);
+
+    /* We've got what we're looking for, skip anything until newline */
+    pj_scan_skip_line(scanner);
+}
+
+static void parse_bandwidth_info(pj_scanner *scanner, pjmedia_sdp_bandw *bandw,
+                                  parse_context *ctx)
+{
+    pj_str_t str;
+
+    ctx->last_error = PJMEDIA_SDP_EINBANDW;
+
+    /* b= */
+    pj_scan_advance_n(scanner, 2, SKIP_WS);
+
+    /* modifier */
+    pj_scan_get_until_ch(scanner, ':', &bandw->modifier);
+    pj_scan_get_char(scanner);
+
+    /* value */
+    pj_scan_get_until_chr(scanner, " \t\r\n", &str);
+    bandw->value = pj_strtoul(&str);
 
     /* We've got what we're looking for, skip anything until newline */
@@ -1181 +1213 @@
     pjmedia_sdp_attr *attr;
     pjmedia_sdp_conn *conn;
+    pjmedia_sdp_bandw *bandw;
     pj_str_t dummy;
     int cur_name = 254;
@@ -1254 +1287 @@
                     }
                     break;
+                case 'b':
+                    bandw = PJ_POOL_ZALLOC_T(pool, pjmedia_sdp_bandw);
+                    parse_bandwidth_info(&scanner, bandw, &ctx);
+                    if (media) {
+                        media->bandw[media->bandw_count++] = bandw;
+                    } else {
+                        session->bandw[session->bandw_count++] = bandw;
+                    }
+                    break;
                 default:
                     if (cur_name >= 'a' && cur_name <= 'z')
@@ -1333 +1375 @@
     }
 
+    /* Duplicate bandwidth info */
+    sess->bandw_count = rhs->bandw_count;
+    for (i=0; i<rhs->bandw_count; ++i) {
+        sess->bandw[i] = pjmedia_sdp_bandw_clone(pool, rhs->bandw[i]);
+    }
+
     /* Clone time line. */
     sess->time.start = rhs->time.start;