diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-07-27 15:42:49 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-07-27 15:42:49 +0000 |
commit | 4e0adb6ecc52f9479fd83f70bcb61397f23083b8 (patch) | |
tree | 3e590215ed620f6622518d335ecffec2513c1c42 /channel.c | |
parent | 13af22e0f4e62ad1026c6d1ee9dcffa75bc4836b (diff) |
Merged revisions 38347 via svnmerge from
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: http://svn.digium.com/svn/asterisk/trunk@38348 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channel.c')
-rw-r--r-- | channel.c | 11 |
1 files changed, 7 insertions, 4 deletions
@@ -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; |