diff options
author | Richard Mudgett <rmudgett@digium.com> | 2015-04-08 18:14:00 +0000 |
---|---|---|
committer | Richard Mudgett <rmudgett@digium.com> | 2015-04-08 18:14:00 +0000 |
commit | 4441bb6a2560d7781d87b15eaa2cef58f7645da8 (patch) | |
tree | 8b16695e6e53058613d358d2fee314b379cb3767 /bridges/bridge_softmix.c | |
parent | f7674409061bcd5be8fa0d59a7f53221057d441a (diff) |
Bridging: Eliminate the unnecessary make channel compatible with bridge operation.
When a channel enters the bridging system it is first made compatible with
the bridge and then the bridge technology makes the channel compatible
with the technology. For all but the DAHDI native and softmix bridge
technologies the make channel compatible with the bridge step is an
effective noop because the other technologies allow all audio formats.
For the DAHDI native bridge technology it doesn't matter because it is not
an initial bridge technology and chan_dahdi allows only one native format
per channel. For the softmix bridge technology, it is a noop at best and
harmful at worst because the wrong translation path could be setup if the
channel's native formats allow more than one audio format.
This is an intermediate patch for a series of patches aimed at improving
translation path choices.
* Removed code dealing with the unnecessary step of making the channel
compatible with the bridge.
ASTERISK-24841
Reported by: Matt Jordan
Review: https://reviewboard.asterisk.org/r/4600/
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@434424 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'bridges/bridge_softmix.c')
-rw-r--r-- | bridges/bridge_softmix.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/bridges/bridge_softmix.c b/bridges/bridge_softmix.c index 53be7d975..72299209c 100644 --- a/bridges/bridge_softmix.c +++ b/bridges/bridge_softmix.c @@ -1194,18 +1194,17 @@ static struct ast_bridge_technology softmix_bridge = { static int unload_module(void) { - ao2_cleanup(softmix_bridge.format_capabilities); - softmix_bridge.format_capabilities = NULL; - return ast_bridge_technology_unregister(&softmix_bridge); + ast_bridge_technology_unregister(&softmix_bridge); + return 0; } static int load_module(void) { - if (!(softmix_bridge.format_capabilities = ast_format_cap_alloc(AST_FORMAT_CAP_FLAG_DEFAULT))) { + if (ast_bridge_technology_register(&softmix_bridge)) { + unload_module(); return AST_MODULE_LOAD_DECLINE; } - ast_format_cap_append(softmix_bridge.format_capabilities, ast_format_slin, 0); - return ast_bridge_technology_register(&softmix_bridge); + return AST_MODULE_LOAD_SUCCESS; } AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Multi-party software based channel mixing"); |