Changeset 4581 for pjproject/trunk/pjsip-apps/src/python/_pjsua.h

Timestamp:

Aug 9, 2013 8:39:20 AM (11 years ago)

Author:

bennylp

Message:

Fixed #1694: Python enhancement: added QoS and RTP settings in account config

File:

• pjproject/trunk/pjsip-apps/src/python/_pjsua.h (modified) (13 diffs)

pjproject/trunk/pjsip-apps/src/python/_pjsua.h

@@ -1328 +1328 @@
     PyObject   *public_addr;
     PyObject   *bound_addr;
+    pj_qos_type  qos_type;
+    pj_uint8_t  qos_params_flags;
+    pj_uint8_t  qos_params_dscp_val;
+    pj_uint8_t  qos_params_so_prio;
+    pj_qos_wmm_prio  qos_params_wmm_prio;
+
 } PyObj_pjsua_transport_config;
 
@@ -1338 +1344 @@
 {
     Py_XDECREF(self->public_addr);    
-    Py_XDECREF(self->bound_addr);    
+    Py_XDECREF(self->bound_addr);
     self->ob_type->tp_free((PyObject*)self);
 }
@@ -1350 +1356 @@
     cfg->bound_addr     = PyString_ToPJ(obj->bound_addr);
     cfg->port           = obj->port;
-
+    cfg->qos_type       = obj->qos_type;
+    cfg->qos_params.flags       = obj->qos_params_flags;
+    cfg->qos_params.dscp_val    = obj->qos_params_dscp_val;
+    cfg->qos_params.so_prio     = obj->qos_params_so_prio;
+    cfg->qos_params.wmm_prio    = obj->qos_params_wmm_prio;
 }
 
@@ -1362 +1372 @@
     obj->bound_addr = PyString_FromPJ(&cfg->bound_addr);
 
-    obj->port = cfg->port;
+    obj->port           = cfg->port;
+    obj->qos_type       = cfg->qos_type;
+    obj->qos_params_flags       = cfg->qos_params.flags;
+    obj->qos_params_dscp_val    = cfg->qos_params.dscp_val;
+    obj->qos_params_so_prio     = cfg->qos_params.so_prio;
+    obj->qos_params_wmm_prio    = cfg->qos_params.wmm_prio;
+
 }
 
@@ -1382 +1398 @@
     if (self != NULL) {
         self->public_addr = PyString_FromString("");
-        self->bound_addr = PyString_FromString("");
+        self->bound_addr = PyString_FromString("");
     }
 
@@ -1420 +1436 @@
         "used for that purpose)."               
     },    
+    {
+        "qos_type", T_INT,
+        offsetof(PyObj_pjsua_transport_config, qos_type), 0,
+        "High level traffic classification."
+        "Enumerator:"
+        "  0: PJ_QOS_TYPE_BEST_EFFORT"
+        "       Best effort traffic (default value). Any QoS function calls with "
+        "       specifying this value are effectively no-op"
+        "  1: PJ_QOS_TYPE_BACKGROUND"
+        "       Background traffic."
+        "  2: PJ_QOS_TYPE_VIDEO"
+        "       Video traffic."
+        "  3: PJ_QOS_TYPE_VOICE"
+        "       Voice traffic."
+        "  4: PJ_QOS_TYPE_CONTROL"
+        "       Control traffic."
+    },
+    {
+        "qos_params_flags", T_INT,
+        offsetof(PyObj_pjsua_transport_config, qos_params_flags), 0,
+        "Determines which values to set, bitmask of pj_qos_flag."
+        "   PJ_QOS_PARAM_HAS_DSCP = 1"
+        "   PJ_QOS_PARAM_HAS_SO_PRIO = 2"
+        "   PJ_QOS_PARAM_HAS_WMM = 4"
+    },
+    {
+        "qos_params_dscp_val", T_INT,
+        offsetof(PyObj_pjsua_transport_config, qos_params_dscp_val), 0,
+        "The 6 bits DSCP value to set."
+        "Example: 46=EF, 26=AF31, 24=CS3..."
+    },
+    {
+        "qos_params_so_prio", T_INT,
+        offsetof(PyObj_pjsua_transport_config, qos_params_so_prio), 0,
+        "Socket SO_PRIORITY value."
+    },
+    {
+        "qos_params_wmm_prio", T_INT,
+        offsetof(PyObj_pjsua_transport_config, qos_params_wmm_prio), 0,
+        "Standard WMM priorities."
+        "Enumerator:"
+        "  0: PJ_QOS_WMM_PRIO_BULK_EFFORT"
+        "       Bulk effort priority"
+        "  1: PJ_QOS_WMM_PRIO_BULK"
+        "       Bulk priority."
+        "  2: PJ_QOS_WMM_PRIO_VIDEO"
+        "       Video priority"
+        "  3: PJ_QOS_WMM_PRIO_VOICE"
+        "       Voice priority."
+    },
     {NULL}  /* Sentinel */
 };
@@ -1676 +1742 @@
     unsigned         use_srtp;
     unsigned         srtp_secure_signaling;
+    PyObject        *rtp_transport_cfg;
 } PyObj_pjsua_acc_config;
 
@@ -1695 +1762 @@
     Py_XDECREF(self->contact_uri_params);
     Py_XDECREF(self->ka_data);
+    Py_XDECREF(self->rtp_transport_cfg);
     self->ob_type->tp_free((PyObject*)self);
 }
@@ -1728 +1796 @@
     for (i=0; i<cfg->cred_count; ++i) {
         PyObj_pjsip_cred_info * ci;
-        
+
         ci = (PyObj_pjsip_cred_info *)
              PyObj_pjsip_cred_info_new(&PyTyp_pjsip_cred_info,NULL,NULL);
@@ -1756 +1824 @@
     obj->use_srtp = cfg->use_srtp;
     obj->srtp_secure_signaling = cfg->srtp_secure_signaling;
+
+    Py_XDECREF(obj->rtp_transport_cfg);
+    PyObj_pjsua_transport_config *tconf;
+    tconf = (PyObj_pjsua_transport_config*) PyObj_pjsua_transport_config_new(&PyTyp_pjsua_transport_config,NULL, NULL);
+    PyObj_pjsua_transport_config_import(tconf, &cfg->rtp_cfg);
+    obj->rtp_transport_cfg = (PyObject *) tconf;
 }
 
@@ -1785 +1859 @@
         cfg->cred_count = PJ_ARRAY_SIZE(cfg->cred_info);
     for (i = 0; i < cfg->cred_count; i++) {
-        PyObj_pjsip_cred_info *ci;
-        ci = (PyObj_pjsip_cred_info*) 
+        PyObj_pjsip_cred_info *ci;
+        ci = (PyObj_pjsip_cred_info*)
              PyList_GetItem((PyObject *)obj->cred_info, i);
         PyObj_pjsip_cred_info_export(&cfg->cred_info[i], ci);
@@ -1806 +1880 @@
     cfg->use_srtp = obj->use_srtp;
     cfg->srtp_secure_signaling = obj->srtp_secure_signaling;
+
+    PyObj_pjsua_transport_config *tconf;
+        tconf = (PyObj_pjsua_transport_config*) obj->rtp_transport_cfg;
+        PyObj_pjsua_transport_config_export(&cfg->rtp_cfg, tconf);
 }
 
@@ -1997 +2075 @@
         offsetof(PyObj_pjsua_acc_config, srtp_secure_signaling), 0,
         "Specify if SRTP requires secure signaling to be used."
+    },
+    {
+        "rtp_transport_cfg", T_OBJECT_EX,
+        offsetof(PyObj_pjsua_acc_config, rtp_transport_cfg), 0,
+        "Transport configuration for RTP."
     },