From a4e28347fea9bc9eea502e8fddfea3021c04a891 Mon Sep 17 00:00:00 2001 From: Joshua Colp Date: Fri, 8 Sep 2006 04:37:07 +0000 Subject: [PATCH] Use ast_best_codec to set the read/write format git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@42402 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_local.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/channels/chan_local.c b/channels/chan_local.c index a28964167c..84fd9d220f 100644 --- a/channels/chan_local.c +++ b/channels/chan_local.c @@ -515,7 +515,7 @@ static struct local_pvt *local_alloc(char *data, int format) static struct ast_channel *local_new(struct local_pvt *p, int state) { struct ast_channel *tmp, *tmp2; - int randnum = rand() & 0xffff; + int randnum = rand() & 0xffff, fmt = 0; tmp = ast_channel_alloc(1); tmp2 = ast_channel_alloc(1); @@ -537,14 +537,15 @@ static struct ast_channel *local_new(struct local_pvt *p, int state) tmp2->type = type; ast_setstate(tmp, state); ast_setstate(tmp2, AST_STATE_RING); - tmp->writeformat = p->reqformat; - tmp2->writeformat = p->reqformat; - tmp->rawwriteformat = p->reqformat; - tmp2->rawwriteformat = p->reqformat; - tmp->readformat = p->reqformat; - tmp2->readformat = p->reqformat; - tmp->rawreadformat = p->reqformat; - tmp2->rawreadformat = p->reqformat; + fmt = ast_best_codec(p->reqformat); + tmp->writeformat = fmt; + tmp2->writeformat = fmt; + tmp->rawwriteformat = fmt; + tmp2->rawwriteformat = fmt; + tmp->readformat = fmt; + tmp2->readformat = fmt; + tmp->rawreadformat = fmt; + tmp2->rawreadformat = fmt; tmp->tech_pvt = p; tmp2->tech_pvt = p; p->owner = tmp;