kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2026-07-28 00:10:25 -07:00
Code Issues Packages Projects Releases Wiki Activity

SDP: Update ast_get_topology_from_sdp() to keep RTP map.

Browse Source 
* Add failure exits to ast_get_topology_from_sdp().

Change-Id: I4cc85c1ede8d712766ed20f544dbcef04c8c1049
This commit is contained in:
Richard Mudgett
2017-05-09 12:57:57 -05:00
parent c2906dfa05
commit ae7689f093
5 changed files with 93 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/asterisk/sdp.h
+2 -1
View File
@@ -638,11 +638,12 @@ void ast_sdp_rtpmap_free(struct ast_sdp_rtpmap *rtpmap);
* each m-line corresponding to a stream in the created topology.
*
* \param sdp The SDP to convert
* \param g726_non_standard Non-zero if G.726 is non-standard
*
* \retval NULL An error occurred when converting
* \retval non-NULL The generated stream topology
*
* \since 15.0.0
*/
struct ast_stream_topology *ast_get_topology_from_sdp(const struct ast_sdp *sdp);
struct ast_stream_topology *ast_get_topology_from_sdp(const struct ast_sdp *sdp, int g726_non_standard);
#endif /* _SDP_PRIV_H */
include/asterisk/stream.h
+35 -35
View File
@@ -55,39 +55,39 @@ typedef void (*ast_stream_data_free_fn)(void *);
* \brief States that a stream may be in
*/
enum ast_stream_state {
/*!
* \brief Set when the stream has been removed
*/
AST_STREAM_STATE_REMOVED = 0,
/*!
* \brief Set when the stream is sending and receiving media
*/
AST_STREAM_STATE_SENDRECV,
/*!
* \brief Set when the stream is sending media only
*/
AST_STREAM_STATE_SENDONLY,
/*!
* \brief Set when the stream is receiving media only
*/
AST_STREAM_STATE_RECVONLY,
/*!
* \brief Set when the stream is not sending OR receiving media
*/
AST_STREAM_STATE_INACTIVE,
/*!
* \brief Set when the stream has been removed
*/
AST_STREAM_STATE_REMOVED = 0,
/*!
* \brief Set when the stream is sending and receiving media
*/
AST_STREAM_STATE_SENDRECV,
/*!
* \brief Set when the stream is sending media only
*/
AST_STREAM_STATE_SENDONLY,
/*!
* \brief Set when the stream is receiving media only
*/
AST_STREAM_STATE_RECVONLY,
/*!
* \brief Set when the stream is not sending OR receiving media
*/
AST_STREAM_STATE_INACTIVE,
};
/*!
* \brief Stream data slots
*/
enum ast_stream_data_slot {
/*!
* \brief Data slot for RTP instance
*/
AST_STREAM_DATA_RTP_INSTANCE = 0,
/*!
* \brief Controls the size of the data pointer array
*/
/*!
* \brief Data slot for RTP instance
*/
AST_STREAM_DATA_RTP_CODECS = 0,
/*!
* \brief Controls the size of the data pointer array
*/
AST_STREAM_DATA_SLOT_MAX
};
@@ -386,15 +386,15 @@ struct ast_stream_topology *ast_stream_topology_create_from_format_cap(
*
* \param topology The topology of streams
*
* \retval non-NULL success
* \retval NULL failure
*
* \note The stream topology is NOT altered by this function.
*
* \since 15
*/
* \retval non-NULL success
* \retval NULL failure
*
* \note The stream topology is NOT altered by this function.
*
* \since 15
*/
struct ast_format_cap *ast_format_cap_from_stream_topology(
struct ast_stream_topology *topology);
struct ast_stream_topology *topology);
/*!
* \brief Gets the first stream of a specific type from the topology