diff options
| author | Benny Prijono <bennylp@teluu.com> | 2007-12-28 08:51:58 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2007-12-28 08:51:58 +0000 |
| commit | c31b7e9ae914c4a79534ae6f42d4d8de8b6465e7 (patch) | |
| tree | 86a1f517ced9c7045f85ce5bb7f4cda43918804e /pjmedia/include | |
| parent | d70f06c72122824cbabba385d16670a763eeb277 (diff) | |
Ticket #433: Failure in media negotiation when SDP contains two audio media lines (thanks Arie Velthoen)
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@1639 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia/include')
| -rw-r--r-- | pjmedia/include/pjmedia/errno.h | 5 | ||||
| -rw-r--r-- | pjmedia/include/pjmedia/stream.h | 1 | ||||
| -rw-r--r-- | pjmedia/include/pjmedia/types.h | 19 |
3 files changed, 25 insertions, 0 deletions
diff --git a/pjmedia/include/pjmedia/errno.h b/pjmedia/include/pjmedia/errno.h index 3b1f7cd3..f14e3599 100644 --- a/pjmedia/include/pjmedia/errno.h +++ b/pjmedia/include/pjmedia/errno.h @@ -148,6 +148,11 @@ PJ_BEGIN_DECL * Invalid SDP "rtcp" attribute. */ #define PJMEDIA_SDP_EINRTCP (PJMEDIA_ERRNO_START+35) /* 220035 */ +/** + * @hideinitializer + * Invalid SDP media transport protocol. + */ +#define PJMEDIA_SDP_EINPROTO (PJMEDIA_ERRNO_START+36) /* 220036 */ /************************************************************ diff --git a/pjmedia/include/pjmedia/stream.h b/pjmedia/include/pjmedia/stream.h index 4967c380..64082a8b 100644 --- a/pjmedia/include/pjmedia/stream.h +++ b/pjmedia/include/pjmedia/stream.h @@ -89,6 +89,7 @@ typedef struct pjmedia_channel pjmedia_channel; struct pjmedia_stream_info { pjmedia_type type; /**< Media type (audio, video) */ + pjmedia_tp_proto proto; /**< Transport protocol (RTP/AVP, etc.) */ pjmedia_dir dir; /**< Media direction. */ pj_sockaddr rem_addr; /**< Remote RTP address */ pj_sockaddr rem_rtcp; /**< Optional remote RTCP address. If diff --git a/pjmedia/include/pjmedia/types.h b/pjmedia/include/pjmedia/types.h index ed080d27..cf7725df 100644 --- a/pjmedia/include/pjmedia/types.h +++ b/pjmedia/include/pjmedia/types.h @@ -68,6 +68,25 @@ typedef enum pjmedia_type } pjmedia_type; +/** + * Media transport protocol. + */ +typedef enum pjmedia_tp_proto +{ + /** No transport type */ + PJMEDIA_TP_PROTO_NONE = 0, + + /** RTP using A/V profile */ + PJMEDIA_TP_PROTO_RTP_AVP, + + /** Secure RTP */ + PJMEDIA_TP_PROTO_RTP_SAVP, + + /** Unknown */ + PJMEDIA_TP_PROTO_UNKNOWN + +} pjmedia_tp_proto; + /** * Media direction. |