kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-09 06:28:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge in the bridge_construction branch to make the system use the Bridging API.

Browse Source 
Breaks many things until they can be reworked.  A partial list:
chan_agent
chan_dahdi, chan_misdn, chan_iax2 native bridging
app_queue
COLP updates
DTMF attended transfers
Protocol attended transfers


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@389378 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2013-05-21 18:00:22 +00:00
parent e1e1cc2dee
commit 3d63833bd6
99 changed files with 19717 additions and 7682 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
include/asterisk/rtp_engine.h
View File

@@ -1540,24 +1540,6 @@ int ast_rtp_instance_fd(struct ast_rtp_instance *instance, int rtcp);
*/
struct ast_rtp_glue *ast_rtp_instance_get_glue(const char *type);
/*!
* \brief Bridge two channels that use RTP instances
*
* \param c0 First channel part of the bridge
* \param c1 Second channel part of the bridge
* \param flags Bridging flags
* \param fo If a frame needs to be passed up it is stored here
* \param rc Channel that passed the above frame up
* \param timeoutms How long the channels should be bridged for
*
* \retval Bridge result
*
* \note This should only be used by channel drivers in their technology declaration.
*
* \since 1.8
*/
enum ast_bridge_result ast_rtp_instance_bridge(struct ast_channel *c0, struct ast_channel *c1, int flags, struct ast_frame **fo, struct ast_channel **rc, int timeoutms);
/*!
* \brief Get the other RTP instance that an instance is bridged to
*
@@ -1578,6 +1560,16 @@ enum ast_bridge_result ast_rtp_instance_bridge(struct ast_channel *c0, struct as
*/
struct ast_rtp_instance *ast_rtp_instance_get_bridged(struct ast_rtp_instance *instance);
/*!
* \brief Set the other RTP instance that an instance is bridged to
*
* \param instance The RTP instance that we want to set the bridged value on
* \param bridged The RTP instance they are bridged to
*
* \since 12
*/
void ast_rtp_instance_set_bridged(struct ast_rtp_instance *instance, struct ast_rtp_instance *bridged);
/*!
* \brief Make two channels compatible for early bridging
*