mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-03 19:16:46 +00:00
Merged revisions 123930 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r123930 | tilghman | 2008-06-19 11:58:19 -0500 (Thu, 19 Jun 2008) | 5 lines Change informative messages to use the _multiple variant when multiple formats are possible. (Closes issue #12848) Reported by klaus3000 ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@123931 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -2677,10 +2677,10 @@ static struct ast_frame *__ast_read(struct ast_channel *chan, int dropaudio)
|
|||||||
f = &ast_null_frame;
|
f = &ast_null_frame;
|
||||||
}
|
}
|
||||||
} else if ((f->frametype == AST_FRAME_VOICE) && !(f->subclass & chan->nativeformats)) {
|
} else if ((f->frametype == AST_FRAME_VOICE) && !(f->subclass & chan->nativeformats)) {
|
||||||
/* This frame can't be from the current native formats -- drop it on the
|
/* This frame is not one of the current native formats -- drop it on the floor */
|
||||||
floor */
|
char to[200];
|
||||||
ast_log(LOG_NOTICE, "Dropping incompatible voice frame on %s of format %s since our native format has changed to %s\n",
|
ast_log(LOG_NOTICE, "Dropping incompatible voice frame on %s of format %s since our native format has changed to %s\n",
|
||||||
chan->name, ast_getformatname(f->subclass), ast_getformatname(chan->nativeformats));
|
chan->name, ast_getformatname(f->subclass), ast_getformatname_multiple(to, sizeof(to), chan->nativeformats));
|
||||||
ast_frfree(f);
|
ast_frfree(f);
|
||||||
f = &ast_null_frame;
|
f = &ast_null_frame;
|
||||||
} else if ((f->frametype == AST_FRAME_VOICE)) {
|
} else if ((f->frametype == AST_FRAME_VOICE)) {
|
||||||
@@ -3182,6 +3182,7 @@ static int set_format(struct ast_channel *chan, int fmt, int *rawformat, int *fo
|
|||||||
{
|
{
|
||||||
int native;
|
int native;
|
||||||
int res;
|
int res;
|
||||||
|
char from[200], to[200];
|
||||||
|
|
||||||
/* Make sure we only consider audio */
|
/* Make sure we only consider audio */
|
||||||
fmt &= AST_FORMAT_AUDIO_MASK;
|
fmt &= AST_FORMAT_AUDIO_MASK;
|
||||||
@@ -3201,7 +3202,8 @@ static int set_format(struct ast_channel *chan, int fmt, int *rawformat, int *fo
|
|||||||
|
|
||||||
if (res < 0) {
|
if (res < 0) {
|
||||||
ast_log(LOG_WARNING, "Unable to find a codec translation path from %s to %s\n",
|
ast_log(LOG_WARNING, "Unable to find a codec translation path from %s to %s\n",
|
||||||
ast_getformatname(native), ast_getformatname(fmt));
|
ast_getformatname_multiple(from, sizeof(from), native),
|
||||||
|
ast_getformatname_multiple(to, sizeof(to), fmt));
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user