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

Merged revisions 38347 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r38347 | kpfleming | 2006-07-27 10:40:03 -0500 (Thu, 27 Jul 2006) | 2 lines

do a better job avoiding translation path teardown/setup when not needed

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@38348 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2006-07-27 15:42:49 +00:00
parent 03356c2a4d
commit 01e006c33c
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
channel.c
View File

@@ -2472,10 +2472,6 @@ static int set_format(struct ast_channel *chan, int fmt, int *rawformat, int *fo
/* Make sure we only consider audio */
fmt &= AST_FORMAT_AUDIO_MASK;
/* if already in the desired format nothing to do here */
if (*format == fmt)
return 0;
native = chan->nativeformats;
/* Find a translation path from the native format to one of the desired formats */
if (!direction)
@@ -2493,6 +2489,13 @@ static int set_format(struct ast_channel *chan, int fmt, int *rawformat, int *fo
/* Now we have a good choice for both. */
ast_channel_lock(chan);
if ((*rawformat == native) && (*format == fmt)) {
/* the channel is already in these formats, so nothing to do */
ast_channel_unlock(chan);
return 0;
}
*rawformat = native;
/* User perspective is fmt */
*format = fmt;