From 4e0adb6ecc52f9479fd83f70bcb61397f23083b8 Mon Sep 17 00:00:00 2001 From: kpfleming Date: Thu, 27 Jul 2006 15:42:49 +0000 Subject: 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 --- channel.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'channel.c') diff --git a/channel.c b/channel.c index a2ac46ff9..952c7b6ad 100644 --- 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; -- cgit v1.2.3