From 6be25fca557f58806c7a6a841faa28b9bc9e7cf7 Mon Sep 17 00:00:00 2001 From: russell Date: Tue, 12 Jun 2007 19:13:41 +0000 Subject: In ast_channel_make_compatible(), just return if the channels' read and write formats already match up. There are code paths that call this function on a pair of channels multiple times. This made calls fail that were using g729 in some cases. The reason is that codec_g729a will unregister itself from the list of available translators will all licenses are in use. So, the first time the function got called, the right translation path was allocated. However, the second time it got called, the code would not find a translation path to/from g729 and make the call fail, even if the channel actually already had a g729 translation path allocated. (SPD-32) git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@69010 f38db490-d61c-443f-a65b-d21fe96a405b --- main/channel.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'main') diff --git a/main/channel.c b/main/channel.c index defc4b687..7fd58eca9 100644 --- a/main/channel.c +++ b/main/channel.c @@ -3281,6 +3281,11 @@ int ast_channel_make_compatible(struct ast_channel *chan, struct ast_channel *pe int src; int dst; + if (chan->readformat == peer->writeformat && chan->writeformat == peer->readformat) { + /* Already compatible! Moving on ... */ + return 0; + } + /* Set up translation from the chan to the peer */ src = chan->nativeformats; dst = peer->nativeformats; -- cgit v1.2.3