From: Russell Bryant <russell@russellbryant.com>
Date: Tue, 21 Dec 2004 20:15:29 +0000 (+0000)
Subject: Make sure that read/write format are set up correctly
X-Git-Tag: 1.0.11.1~329
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ebc21f175cf73622ab968dffe66fc7ceb01eb5a;p=thirdparty%2Fasterisk.git

Make sure that read/write format are set up correctly


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/v1-0@4515 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 510995b7e0..3b175a0947 100755
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -2711,8 +2711,8 @@ static struct ast_channel *ast_iax2_new(int callno, int state, int capability)
 		tmp->type = type;
 		/* We can support any format by default, until we get restricted */
 		tmp->nativeformats = capability;
-		tmp->readformat = 0;
-		tmp->writeformat = 0;
+		tmp->readformat = ast_best_codec(capability);
+		tmp->writeformat = ast_best_codec(capability);
 		tmp->pvt->pvt = CALLNO_TO_PTR(i->callno);
 		tmp->pvt->send_digit = iax2_digit;
 		tmp->pvt->send_text = iax2_sendtext;
@@ -6270,7 +6270,7 @@ static struct ast_channel *iax2_request(char *type, int format, void *data)
 	ast_mutex_unlock(&iaxsl[callno]);
 	if (c) {
 		/* Choose a format we can live with */
-		if (c->nativeformats & format)
+		if (c->nativeformats & format) 
 			c->nativeformats &= format;
 		else {
 			native = c->nativeformats;
@@ -6283,6 +6283,8 @@ static struct ast_channel *iax2_request(char *type, int format, void *data)
 			}
 			c->nativeformats = native;
 		}
+		c->readformat = ast_best_codec(c->nativeformats);
+		c->writeformat = c->readformat;
 	}
 	return c;
 }