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

bridge_softmix.c: Made use ao2_replace() instead of the inline equivalent.

Browse Source 
* Clarified some read/write format comments.

* Fixed a doxygen tag typo.
........

Merged revisions 423423 from http://svn.asterisk.org/svn/asterisk/branches/13


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@423424 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2014-09-18 17:10:50 +00:00
parent a7add3a257
commit 02cf1835e3
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
bridges/bridge_softmix.c
View File

@@ -328,14 +328,13 @@ static void set_softmix_bridge_data(int rate, int interval, struct ast_bridge_ch
/* Setup write frame parameters */ /* Setup write frame parameters */
sc->write_frame.frametype = AST_FRAME_VOICE; sc->write_frame.frametype = AST_FRAME_VOICE;
ao2_cleanup(sc->write_frame.subclass.format);
/* /*
* NOTE: The format is bumped here because translation could * NOTE: The write_frame format holds a reference because translation
* be needed and the format changed to the translated format * could be needed and the format changed to the translated format
* for the channel. The translated format may not be a * for the channel. The translated format may not be a
* static cached format. * static cached format.
*/ */
sc->write_frame.subclass.format = ao2_bump(ast_format_cache_get_slin_by_rate(rate)); ao2_replace(sc->write_frame.subclass.format, ast_format_cache_get_slin_by_rate(rate));
sc->write_frame.data.ptr = sc->final_buf; sc->write_frame.data.ptr = sc->final_buf;
sc->write_frame.datalen = SOFTMIX_DATALEN(rate, interval); sc->write_frame.datalen = SOFTMIX_DATALEN(rate, interval);
sc->write_frame.samples = SOFTMIX_SAMPLES(rate, interval); sc->write_frame.samples = SOFTMIX_SAMPLES(rate, interval);
@@ -343,8 +342,8 @@ static void set_softmix_bridge_data(int rate, int interval, struct ast_bridge_ch
/* Setup read frame parameters */ /* Setup read frame parameters */
sc->read_frame.frametype = AST_FRAME_VOICE; sc->read_frame.frametype = AST_FRAME_VOICE;
/* /*
* NOTE: The format is not bumbed here because it will always * NOTE: The read_frame format does not hold a reference because it
* be a signed linear format. * will always be a signed linear format.
*/ */
sc->read_frame.subclass.format = ast_format_cache_get_slin_by_rate(channel_read_rate); sc->read_frame.subclass.format = ast_format_cache_get_slin_by_rate(channel_read_rate);
sc->read_frame.data.ptr = sc->our_buf; sc->read_frame.data.ptr = sc->our_buf;
@@ -725,7 +724,7 @@ static void gather_softmix_stats(struct softmix_stats *stats,
* if necessary. * if necessary.
* *
* \retval 0, no changes to internal rate * \retval 0, no changes to internal rate
* \ratval 1, internal rate was changed, update all the channels on the next mixing iteration. * \retval 1, internal rate was changed, update all the channels on the next mixing iteration.
*/ */
static unsigned int analyse_softmix_stats(struct softmix_stats *stats, struct softmix_bridge_data *softmix_data) static unsigned int analyse_softmix_stats(struct softmix_stats *stats, struct softmix_bridge_data *softmix_data)
{ {