Changeset 2966 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c

Timestamp:

Oct 25, 2009 9:02:07 AM (15 years ago)

Author:

bennylp

Message:

Initial commit for ticket #950: QoS support:

• implementation:
  • PJLIB (sock_qos*.*)
• added QoS support in:
  • SIP UDP transport,
  • SIP TCP transport,
  • media UDP transport (done in pjsua-lib),
  • pjnath ICE stream transport,
  • pjnath STUN socket,
  • pjnath TURN client
• added QoS options in pjsua-lib:
  • QoS fields in pjsua_transport_config
• added "--set-qos" parameter in pjsua

Notes:

• QoS in TLS transport is not yet implemented, waiting for #957
• build ok on VS6, VS2005 (multiple targets), Carbide, and Mingw
• no run-time testing yet

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c (modified) (8 diffs)

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c

@@ -385 +385 @@
     for (i=0; i<RTP_RETRY; ++i, next_rtp_port += 2) {
 
-        /* Create and bind RTP socket. */
+        /* Create RTP socket. */
         status = pj_sock_socket(pj_AF_INET(), pj_SOCK_DGRAM(), 0, &sock[0]);
         if (status != PJ_SUCCESS) {
@@ -392 +392 @@
         }
 
+        /* Apply QoS to RTP socket, if specified */
+        status = pj_sock_apply_qos2(sock[0], cfg->qos_type, 
+                                    &cfg->qos_params, 
+                                    2, THIS_FILE, "RTP socket");
+
+        /* Bind RTP socket */
         status=pj_sock_bind_in(sock[0], pj_ntohl(bound_addr.sin_addr.s_addr), 
                                next_rtp_port);
@@ -400 +406 @@
         }
 
-        /* Create and bind RTCP socket. */
+        /* Create RTCP socket. */
         status = pj_sock_socket(pj_AF_INET(), pj_SOCK_DGRAM(), 0, &sock[1]);
         if (status != PJ_SUCCESS) {
@@ -408 +414 @@
         }
 
+        /* Apply QoS to RTCP socket, if specified */
+        status = pj_sock_apply_qos2(sock[1], cfg->qos_type, 
+                                    &cfg->qos_params, 
+                                    2, THIS_FILE, "RTCP socket");
+
+        /* Bind RTCP socket */
         status=pj_sock_bind_in(sock[1], pj_ntohl(bound_addr.sin_addr.s_addr), 
                                (pj_uint16_t)(next_rtp_port+1));
@@ -882 +894 @@
 
 /* Create ICE media transports (when ice is enabled) */
-static pj_status_t create_ice_media_transports(void)
+static pj_status_t create_ice_media_transports(pjsua_transport_config *cfg)
 {
     char stunip[PJ_INET6_ADDRSTRLEN];
@@ -916 +928 @@
         ice_cfg.stun.max_host_cands = pjsua_var.media_cfg.ice_max_host_cands;
 
+    /* Copy QoS setting to STUN setting */
+    ice_cfg.stun.cfg.qos_type = cfg->qos_type;
+    pj_memcpy(&ice_cfg.stun.cfg.qos_params, &cfg->qos_params,
+              sizeof(cfg->qos_params));
+
     /* Configure TURN settings */
     if (pjsua_var.media_cfg.enable_turn) {
@@ -931 +948 @@
                   &pjsua_var.media_cfg.turn_auth_cred,
                   sizeof(ice_cfg.turn.auth_cred));
+
+        /* Copy QoS setting to TURN setting */
+        ice_cfg.turn.cfg.qos_type = cfg->qos_type;
+        pj_memcpy(&ice_cfg.turn.cfg.qos_params, &cfg->qos_params,
+                  sizeof(cfg->qos_params));
     }
 
@@ -1026 +1048 @@
     /* Create the transports */
     if (pjsua_var.media_cfg.enable_ice) {
-        status = create_ice_media_transports();
+        status = create_ice_media_transports(&cfg);
     } else {
         status = create_udp_media_transports(&cfg);