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: https://origsvn.digium.com/svn/asterisk/trunk@38348 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channel.c b/channel.c
index a2ac46ff9c30dfae101e7b34f3225b063f9f89be..952c7b6ad95906bdce9d8fab14c71b2eb5ad1393 100644 (file)
--- a/channel.c
+++ b/channel.c
@@ -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;