diff options
| author | Jenkins2 <jenkins2@gerrit.asterisk.org> | 2017-10-31 13:17:10 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-10-31 13:17:10 -0500 |
| commit | c8cfee06e4e547b11604f334f1ad4c9ada84f444 (patch) | |
| tree | 362bb6dcb1ea44183e85761aa4cbe26ffce98875 /include | |
| parent | 09f7a976bf2cb7f4dea7650f906fa7837cf534ab (diff) | |
| parent | 046c250199d4be728463e8450894d4864e7287fd (diff) | |
Merge "core / pjsip: Add support for grouping streams together." into 15
Diffstat (limited to 'include')
| -rw-r--r-- | include/asterisk/res_pjsip_session.h | 2 | ||||
| -rw-r--r-- | include/asterisk/stream.h | 21 |
2 files changed, 23 insertions, 0 deletions
diff --git a/include/asterisk/res_pjsip_session.h b/include/asterisk/res_pjsip_session.h index 70f94682e..de6589abd 100644 --- a/include/asterisk/res_pjsip_session.h +++ b/include/asterisk/res_pjsip_session.h @@ -111,6 +111,8 @@ struct ast_sip_session_media { char label[AST_UUID_STR_LEN]; /*! \brief The underlying session has been changed in some fashion */ unsigned int changed; + /*! \brief Remote media stream label */ + char *remote_mslabel; }; /*! diff --git a/include/asterisk/stream.h b/include/asterisk/stream.h index 4027231ed..bbde73d1a 100644 --- a/include/asterisk/stream.h +++ b/include/asterisk/stream.h @@ -465,4 +465,25 @@ struct ast_stream *ast_stream_topology_get_first_stream_by_type( void ast_stream_topology_map(const struct ast_stream_topology *topology, struct ast_vector_int *types, struct ast_vector_int *v0, struct ast_vector_int *v1); +/*! + * \brief Get the stream group that a stream is part of + * + * \param stream The stream + * + * \return the numerical stream group (-1 if not in a group) + * + * \since 15.2.0 + */ +int ast_stream_get_group(const struct ast_stream *stream); + +/*! + * \brief Set the stream group for a stream + * + * \param stream The stream + * \param group The group the stream is part of + * + * \since 15.2.0 + */ +void ast_stream_set_group(struct ast_stream *stream, int group); + #endif /* _AST_STREAM_H */ |