diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2013-01-09 23:23:41 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2013-01-09 23:23:41 +0000 |
| commit | 240fab21f903aaa4990c14f38ac017cb93153f3f (patch) | |
| tree | a8271df5e08e5ac0d07ffa2661a0cab47d1be292 /bridges | |
| parent | 63bd8de579f1baf5a372fcb354868f0a9b9e4be8 (diff) | |
Trivial misc bridge code changes.
* softmix_bridge_thread() was redundantly initializing an 8K buffer.
* Promoted a debug message to a warning in multiplexed_add_or_remove().
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@378858 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'bridges')
| -rw-r--r-- | bridges/bridge_multiplexed.c | 3 | ||||
| -rw-r--r-- | bridges/bridge_softmix.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/bridges/bridge_multiplexed.c b/bridges/bridge_multiplexed.c index 432c7e277..bce93cef6 100644 --- a/bridges/bridge_multiplexed.c +++ b/bridges/bridge_multiplexed.c @@ -290,7 +290,8 @@ static void multiplexed_add_or_remove(struct multiplexed_thread *multiplexed_thr ao2_ref(multiplexed_thread, +1); if (ast_pthread_create(&multiplexed_thread->thread, NULL, multiplexed_thread_function, multiplexed_thread)) { ao2_ref(multiplexed_thread, -1); - ast_debug(1, "Failed to create an actual thread for multiplexed thread '%p', trying next time\n", multiplexed_thread); + ast_log(LOG_WARNING, "Failed to create the bridge thread for multiplexed thread '%p', trying next time\n", + multiplexed_thread); } } else if (!multiplexed_thread->service_count && multiplexed_thread->thread != AST_PTHREADT_NULL) { thread = multiplexed_thread->thread; diff --git a/bridges/bridge_softmix.c b/bridges/bridge_softmix.c index 1a0b4fc18..a04388f4c 100644 --- a/bridges/bridge_softmix.c +++ b/bridges/bridge_softmix.c @@ -750,7 +750,7 @@ static int softmix_bridge_thread(struct ast_bridge *bridge) struct softmix_bridge_data *softmix_data = bridge->bridge_pvt; struct ast_timer *timer; struct softmix_translate_helper trans_helper; - int16_t buf[MAX_DATALEN] = { 0, }; + int16_t buf[MAX_DATALEN]; unsigned int stat_iteration_counter = 0; /* counts down, gather stats at zero and reset. */ int timingfd; int update_all_rates = 0; /* set this when the internal sample rate has changed */ |