diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-07-27 15:40:03 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-07-27 15:40:03 +0000 |
commit | 20a7edaed06e844ac967cffdcd01ba231e7bd29c (patch) | |
tree | 3503a176e58cfe234fc5bf2e8026bd8e7786eedf /channel.c | |
parent | 62a60d6cd60e5cc96181345fbd4e706bbd7ace52 (diff) |
do a better job avoiding translation path teardown/setup when not needed
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2@38347 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channel.c')
-rw-r--r-- | channel.c | 11 |
1 files changed, 7 insertions, 4 deletions
@@ -2328,10 +2328,6 @@ static int set_format(struct ast_channel *chan, int fmt, int *rawformat, int *fo int native; int res; - /* 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) @@ -2349,6 +2345,13 @@ static int set_format(struct ast_channel *chan, int fmt, int *rawformat, int *fo /* Now we have a good choice for both. */ ast_mutex_lock(&chan->lock); + + if ((*rawformat == native) && (*format == fmt)) { + /* the channel is already in these formats, so nothing to do */ + ast_mutex_unlock(&chan->lock); + return 0; + } + *rawformat = native; /* User perspective is fmt */ *format = fmt; |