kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-02 03:48:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

New HD ConfBridge conferencing application.

Browse Source 
Includes a new highly optimized and customizable
ConfBridge application capable of mixing audio at
sample rates ranging from 8khz-192khz.

Review: https://reviewboard.asterisk.org/r/1147/



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@314598 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
David Vossel
2011-04-21 18:11:40 +00:00
parent b8f253161b
commit 7f23115ad2
18 changed files with 4890 additions and 635 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
main/channel.c
View File

@@ -3011,6 +3011,15 @@ void ast_deactivate_generator(struct ast_channel *chan)
ast_channel_unlock(chan);
}
static void generator_write_format_change(struct ast_channel *chan)
{
ast_channel_lock(chan);
if (chan->generator && chan->generator->write_format_change) {
chan->generator->write_format_change(chan, chan->generatordata);
}
ast_channel_unlock(chan);
}
static int generator_force(const void *data)
{
/* Called if generator doesn't have data */
@@ -5035,10 +5044,9 @@ static int set_format(struct ast_channel *chan,
ast_debug(1, "Channel driver natively set channel %s to %s format %s\n", chan->name,
direction ? "write" : "read", ast_getformatname(&best_set_fmt));
ast_channel_lock(chan);
ast_format_copy(format, &best_set_fmt);
ast_format_copy(rawformat, &best_set_fmt);
ast_channel_lock(chan);
ast_format_cap_set(chan->nativeformats, &best_set_fmt);
ast_channel_unlock(chan);
@@ -5046,6 +5054,11 @@ static int set_format(struct ast_channel *chan,
ast_translator_free_path(*trans);
}
*trans = NULL;
/* If there is a generator on the channel, it needs to know about this
* change if it is the write format. */
if (direction && chan->generatordata) {
generator_write_format_change(chan);
}
return 0;
}
@@ -5110,6 +5123,12 @@ static int set_format(struct ast_channel *chan,
chan->name,
direction ? "write" : "read",
ast_getformatname(&best_set_fmt));
/* If there is a generator on the channel, it needs to know about this
* change if it is the write format. */
if (direction && chan->generatordata) {
generator_write_format_change(chan);
}
return res;
}