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

bridge_softmix.c,channel.c: Minor code simplification and cleanup.

Browse Source 
* Made code easier to follow in bridge_softmix.c:analyse_softmix_stats()
and made some debug messages more helpful.

* Made some debug and warning messages more helpful in
channel.c:set_format().

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@434617 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2015-04-10 16:37:20 +00:00
parent a63f7ad04a
commit 125acc52fe
2 changed files with 49 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
main/channel.c
View File

@@ -5337,15 +5337,16 @@ static int set_format(struct ast_channel *chan, struct ast_format_cap *cap_set,
res = ast_translator_best_choice(cap_native, cap_set, &best_native_fmt, &best_set_fmt);
}
if (res < 0) {
struct ast_str *codec_from = ast_str_alloca(64);
struct ast_str *codec_to = ast_str_alloca(64);
struct ast_str *codec_native = ast_str_alloca(256);
struct ast_str *codec_set = ast_str_alloca(256);
ast_format_cap_get_names(cap_native, &codec_from);
ast_format_cap_get_names(cap_native, &codec_native);
ast_channel_unlock(chan);
ast_format_cap_get_names(cap_set, &codec_to);
ast_format_cap_get_names(cap_set, &codec_set);
ast_log(LOG_WARNING, "Unable to find a codec translation path from %s to %s\n",
ast_str_buffer(codec_from), ast_str_buffer(codec_to));
ast_log(LOG_WARNING, "Unable to find a codec translation path: %s -> %s\n",
ast_str_buffer(direction ? codec_set : codec_native),
ast_str_buffer(direction ? codec_native : codec_set));
return -1;
}
@@ -5389,10 +5390,11 @@ static int set_format(struct ast_channel *chan, struct ast_format_cap *cap_set,
access->set_format(chan, best_set_fmt);
access->set_rawformat(chan, best_native_fmt);
ast_debug(1, "Set channel %s to %s format %s\n",
ast_debug(1, "Channel %s setting %s format path: %s -> %s\n",
ast_channel_name(chan),
access->direction,
ast_format_get_name(best_set_fmt));
ast_format_get_name(direction ? best_set_fmt : best_native_fmt),
ast_format_get_name(direction ? best_native_fmt : best_set_fmt));
}
ast_channel_unlock(chan);