diff options
| author | Joshua Colp <jcolp@digium.com> | 2017-03-16 07:39:51 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-03-16 07:39:51 -0500 |
| commit | 57be9cf8f98c5e93b60cafb1cc8cbbed154f408a (patch) | |
| tree | 9df3b719b89719675d40fa36a19c7815d752b7ba /include/asterisk | |
| parent | 701b753a0bc4e136ab447a855d6b5db5a6b59ab3 (diff) | |
| parent | 7bc69753bc79fa47508c5d62e9bc27f41698bb41 (diff) | |
Merge "Add rtcp-mux support" into 13
Diffstat (limited to 'include/asterisk')
| -rw-r--r-- | include/asterisk/res_pjsip.h | 2 | ||||
| -rw-r--r-- | include/asterisk/res_pjsip_session.h | 2 | ||||
| -rw-r--r-- | include/asterisk/rtp_engine.h | 11 |
3 files changed, 15 insertions, 0 deletions
diff --git a/include/asterisk/res_pjsip.h b/include/asterisk/res_pjsip.h index d8e172fc5..b0e82f7e4 100644 --- a/include/asterisk/res_pjsip.h +++ b/include/asterisk/res_pjsip.h @@ -755,6 +755,8 @@ struct ast_sip_endpoint { char *contact_user; /*! Do we allow an asymmetric RTP codec? */ unsigned int asymmetric_rtp_codec; + /*! Use RTCP-MUX */ + unsigned int rtcp_mux; }; /*! diff --git a/include/asterisk/res_pjsip_session.h b/include/asterisk/res_pjsip_session.h index 7e65e6d7c..c41cc3ab9 100644 --- a/include/asterisk/res_pjsip_session.h +++ b/include/asterisk/res_pjsip_session.h @@ -83,6 +83,8 @@ struct ast_sip_session_media { int timeout_sched_id; /*! \brief Stream is on hold */ unsigned int held:1; + /*! \brief Does remote support rtcp_mux */ + unsigned int remote_rtcp_mux:1; /*! \brief Stream type this session media handles */ char stream_type[1]; }; diff --git a/include/asterisk/rtp_engine.h b/include/asterisk/rtp_engine.h index c4a5b6b41..e8f3d78b4 100644 --- a/include/asterisk/rtp_engine.h +++ b/include/asterisk/rtp_engine.h @@ -237,6 +237,15 @@ enum ast_rtp_instance_stat { AST_RTP_INSTANCE_STAT_RXOCTETCOUNT, }; +enum ast_rtp_instance_rtcp { + /*! RTCP should not be sent/received */ + AST_RTP_INSTANCE_RTCP_DISABLED = 0, + /*! RTCP should be sent/received based on standard port rules */ + AST_RTP_INSTANCE_RTCP_STANDARD, + /*! RTCP should be sent/received on the same port as RTP */ + AST_RTP_INSTANCE_RTCP_MUX, +}; + /* Codes for RTP-specific data - not defined by our AST_FORMAT codes */ /*! DTMF (RFC2833) */ #define AST_RTP_DTMF (1 << 0) @@ -443,6 +452,8 @@ struct ast_rtp_engine_ice { void (*turn_request)(struct ast_rtp_instance *instance, enum ast_rtp_ice_component_type component, enum ast_transport transport, const char *server, unsigned int port, const char *username, const char *password); + /*! Callback to alter the number of ICE components on a session */ + void (*change_components)(struct ast_rtp_instance *instance, int num_components); }; /*! \brief DTLS setup types */ |