diff options
| author | Scott Griepentrog <sgriepentrog@digium.com> | 2013-10-26 00:27:02 +0000 |
|---|---|---|
| committer | Scott Griepentrog <sgriepentrog@digium.com> | 2013-10-26 00:27:02 +0000 |
| commit | 39a233d32b05f1bae40cd5aaa7db249fb0d6f6f5 (patch) | |
| tree | 5910d380525ca7c8f04905e0d9abb77d9ad52767 /include/asterisk | |
| parent | 78790f0d58c6206e6ca4031c427e8fe623678531 (diff) | |
rtp_engine: fix rtp payloads copy and improve argument names
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
Diffstat (limited to 'include/asterisk')
| -rw-r--r-- | include/asterisk/rtp_engine.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asterisk/rtp_engine.h b/include/asterisk/rtp_engine.h index bda13e891..68003f56b 100644 --- a/include/asterisk/rtp_engine.h +++ b/include/asterisk/rtp_engine.h @@ -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 |