kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-29 18:19:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "channel: Add ability to request an outgoing channel with stream topology."

Browse Source
This commit is contained in:
Jenkins2
2017-04-27 17:53:53 -05:00
committed by Gerrit Code Review
parent 16089ae1c9 2b22c3c84b
commit 528e238447
6 changed files with 230 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
include/asterisk/channel.h
View File

@@ -204,6 +204,8 @@ enum ast_bridge_result {
typedef unsigned long long ast_group_t;
struct ast_stream_topology;
/*! \todo Add an explanation of an Asterisk generator
*/
struct ast_generator {
@@ -631,6 +633,26 @@ struct ast_channel_tech {
*/
struct ast_channel *(* const requester)(const char *type, struct ast_format_cap *cap, const struct ast_assigned_ids *assignedids, const struct ast_channel *requestor, const char *addr, int *cause);
/*!
* \brief Requester - to set up call data structures (pvt's) with stream topology
*
* \param type type of channel to request
* \param topology Stream topology for requested channel
* \param assignedid Unique ID string to assign to channel
* \param requestor channel asking for data
* \param addr destination of the call
* \param cause Cause of failure
*
* \details
* Request a channel of a given type, with addr as optional information used
* by the low level module
*
* \retval NULL failure
* \retval non-NULL channel on success
*/
struct ast_channel *(* const requester_with_stream_topology)(const char *type, struct ast_stream_topology *topology, const struct ast_assigned_ids *assignedids, const struct ast_channel *requestor, const char *addr, int *cause);
int (* const devicestate)(const char *device_number); /*!< Devicestate call back */
int (* const presencestate)(const char *presence_provider, char **subtype, char **message); /*!< Presencestate callback */
@@ -1394,6 +1416,25 @@ struct ast_channel *ast_channel_release(struct ast_channel *chan);
*/
struct ast_channel *ast_request(const char *type, struct ast_format_cap *request_cap, const struct ast_assigned_ids *assignedids, const struct ast_channel *requestor, const char *addr, int *cause);
/*!
* \brief Requests a channel (specifying stream topology)
*
* \param type type of channel to request
* \param topology Stream topology for requested channel
* \param assignedids Unique ID to create channel with
* \param requestor channel asking for data
* \param addr destination of the call
* \param cause Cause of failure
*
* \details
* Request a channel of a given type, with addr as optional information used
* by the low level module
*
* \retval NULL failure
* \retval non-NULL channel on success
*/
struct ast_channel *ast_request_with_stream_topology(const char *type, struct ast_stream_topology *topology, const struct ast_assigned_ids *assignedids, const struct ast_channel *requestor, const char *addr, int *cause);
enum ast_channel_requestor_relationship {
/*! The requestor is the future bridge peer of the channel. */
AST_CHANNEL_REQUESTOR_BRIDGE_PEER,

16
include/asterisk/stream.h
View File

@@ -374,6 +374,22 @@ int ast_stream_topology_set_stream(struct ast_stream_topology *topology,
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.
*
* \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
*/
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
*