diff options
| author | Jenkins2 <jenkins2@gerrit.asterisk.org> | 2017-06-16 11:51:41 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-06-16 11:51:41 -0500 |
| commit | d81293a5ddd545c8b2b3683306a17af91e41c102 (patch) | |
| tree | 8a07ef3f636fcce9f49f46477091ee7e36400643 /include/asterisk | |
| parent | 2f684eb6a5db2b84145fd539f4112f59dffc4b43 (diff) | |
| parent | a95584d07999035de85da3a84a422bb3c6475122 (diff) | |
Merge changes from topic 'sdp_api_adjustments'
* changes:
SDP: Set the remote c= line in RTP instance.
SDP: Add t= line in sdp_create_from_state()
stream: Ignore declined streams for some topology calls.
Diffstat (limited to 'include/asterisk')
| -rw-r--r-- | include/asterisk/sdp_state.h | 4 | ||||
| -rw-r--r-- | include/asterisk/stream.h | 9 |
2 files changed, 10 insertions, 3 deletions
diff --git a/include/asterisk/sdp_state.h b/include/asterisk/sdp_state.h index c2122fbce..b8209e1d5 100644 --- a/include/asterisk/sdp_state.h +++ b/include/asterisk/sdp_state.h @@ -146,6 +146,10 @@ const void *ast_sdp_state_get_local_sdp_impl(struct ast_sdp_state *sdp_state); * \param sdp_state * \param sdp * + * \note It is assumed that the passed in SDP has been checked for sanity + * already. e.g., There are no syntax errors, a c= line is reachable for + * each m= line, etc... + * * \retval 0 Success * \retval non-0 Failure * diff --git a/include/asterisk/stream.h b/include/asterisk/stream.h index 14d624fb2..00169a3f1 100644 --- a/include/asterisk/stream.h +++ b/include/asterisk/stream.h @@ -401,8 +401,11 @@ struct ast_stream_topology *ast_stream_topology_create_from_format_cap( struct ast_format_cap *cap); /*! - * \brief A helper function that, given a stream topology, creates a format - * capabilities structure containing all formats from all streams. + * \brief Create a format capabilities structure representing the topology. + * + * \details + * A helper function that, given a stream topology, creates a format + * capabilities structure containing all formats from all active streams. * * \param topology The topology of streams * @@ -417,7 +420,7 @@ struct ast_format_cap *ast_format_cap_from_stream_topology( struct ast_stream_topology *topology); /*! - * \brief Gets the first stream of a specific type from the topology + * \brief Gets the first active stream of a specific type from the topology * * \param topology The topology of streams * \param type The media type |