kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-08 22:27:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

rtp_engine: fix rtp payloads copy and improve argument names

Browse Source 
In function ast_rtp_instance_early _bridge_make_compatible the
use of instance 0/1 as arguments doesn't clearly communicate a
direction that the copying of payloads from the source channel
to the destination channel will occur, making it more probable
to have the arguments to ast_rtp_codecs_payloads_copy() put in
the reverse order.  This patch renames the arguments with _dst
and _src suffixes and corrects the copy direction.

(closes issue ASTERISK-21464)
Reported by: Kevin Stewart
Review: https://reviewboard.asterisk.org/r/2894/
........

Merged revisions 402000 from http://svn.asterisk.org/svn/asterisk/branches/1.8
Test shows rtpmap:119 being copied per this change, but is not in sip invite
........

Merged revisions 402042 from http://svn.asterisk.org/svn/asterisk/branches/11
........

Merged revisions 402043 from http://svn.asterisk.org/svn/asterisk/branches/12


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@402054 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Scott Griepentrog
2013-10-26 00:27:02 +00:00
parent 78790f0d58
commit 39a233d32b
2 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/asterisk/rtp_engine.h
View File

@@ -1656,12 +1656,12 @@ void ast_rtp_instance_set_bridged(struct ast_rtp_instance *instance, struct ast_
/*!
* \brief Make two channels compatible for early bridging
*
* \param c0 First channel part of the bridge
* \param c1 Second channel part of the bridge
* \param c_dst Destination channel to copy to
* \param c_src Source channel to copy from
*
* \since 1.8
*/
void ast_rtp_instance_early_bridge_make_compatible(struct ast_channel *c0, struct ast_channel *c1);
void ast_rtp_instance_early_bridge_make_compatible(struct ast_channel *c_dst, struct ast_channel *c_src);
/*!
* \brief Early bridge two channels that use RTP instances