From 6afc9c6c8f98496010089a1b12afc05392d886e2 Mon Sep 17 00:00:00 2001 From: "Kevin P. Fleming" Date: Thu, 27 Jul 2006 15:40:03 +0000 Subject: [PATCH] do a better job avoiding translation path teardown/setup when not needed git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@38347 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channel.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/channel.c b/channel.c index a80960e70e..b2c29b3cb5 100644 --- a/channel.c +++ b/channel.c @@ -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; -- 2.47.2