diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-10-25 00:32:23 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-10-25 00:32:23 +0000 |
commit | cfed87ed3a4b4c177d860180d629a4a5924f58b0 (patch) | |
tree | 94ac43ea2c20c5708d382f8ed7e32b81ce82ccfd /main/rtp.c | |
parent | 28cda01b7c4a10cca2ba565766595797fb0f7b72 (diff) |
Merged revisions 46154 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r46154 | kpfleming | 2006-10-24 19:26:17 -0500 (Tue, 24 Oct 2006) | 2 lines
add passthrough and file format support for G.722 16KHz audio (issue #5084, original patch by andrew, updated by mithraen)
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@46155 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/rtp.c')
-rw-r--r-- | main/rtp.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/main/rtp.c b/main/rtp.c index 589584dee..c34f56b11 100644 --- a/main/rtp.c +++ b/main/rtp.c @@ -1330,6 +1330,7 @@ static struct { {{1, AST_FORMAT_G729A}, "audio", "G729"}, {{1, AST_FORMAT_SPEEX}, "audio", "speex"}, {{1, AST_FORMAT_ILBC}, "audio", "iLBC"}, + {{1, AST_FORMAT_G722}, "audio", "G722"}, {{1, AST_FORMAT_G726_AAL2}, "audio", "AAL2-G726-32"}, {{0, AST_RTP_DTMF}, "audio", "telephone-event"}, {{0, AST_RTP_CISCO_DTMF}, "audio", "cisco-telephone-event"}, @@ -1356,6 +1357,7 @@ static struct rtpPayloadType static_RTP_PT[MAX_RTP_PT] = { [6] = {1, AST_FORMAT_ADPCM}, /* 16 kHz */ [7] = {1, AST_FORMAT_LPC10}, [8] = {1, AST_FORMAT_ALAW}, + [9] = {1, AST_FORMAT_G722}, [10] = {1, AST_FORMAT_SLINEAR}, /* 2 channels */ [11] = {1, AST_FORMAT_SLINEAR}, /* 1 channel */ [13] = {0, AST_RTP_CN}, |