aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authordvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b>2010-06-17 18:36:06 +0000
committerdvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b>2010-06-17 18:36:06 +0000
commit6fbec565b2d014b8dd032f3dcc111ef746454f4b (patch)
treec62961225d6079081762d5ed7e6a1ca96472b069 /main
parent637447be7d05aaac944171053df4f82e2cb8ab07 (diff)
adds support for slin16 in sip
(closes issue #16153) Reported by: kfister Patches: 16153-1.6.2.0-rc5.patch uploaded by kfister (license 912) slin16.sip.patch.1 uploaded by malcolmd (license 924) Tested by: kfister, malcolmd git-svn-id: http://svn.digium.com/svn/asterisk/trunk@271261 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
-rw-r--r--main/rtp_engine.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/main/rtp_engine.c b/main/rtp_engine.c
index 5e4db2309..eeaa008a8 100644
--- a/main/rtp_engine.c
+++ b/main/rtp_engine.c
@@ -97,6 +97,7 @@ static const struct ast_rtp_mime_type {
{{1, AST_FORMAT_G726}, "audio", "G726-32", 8000},
{{1, AST_FORMAT_ADPCM}, "audio", "DVI4", 8000},
{{1, AST_FORMAT_SLINEAR}, "audio", "L16", 8000},
+ {{1, AST_FORMAT_SLINEAR16}, "audio", "L16", 16000},
{{1, AST_FORMAT_LPC10}, "audio", "LPC", 8000},
{{1, AST_FORMAT_G729A}, "audio", "G729", 8000},
{{1, AST_FORMAT_G729A}, "audio", "G729A", 8000},
@@ -165,15 +166,16 @@ static const struct ast_rtp_payload_type static_RTP_PT[AST_RTP_MAX_PT] = {
[102] = {1, AST_FORMAT_SIREN7},
[103] = {1, AST_FORMAT_H263_PLUS},
[104] = {1, AST_FORMAT_MP4_VIDEO},
- [105] = {1, AST_FORMAT_T140RED}, /* Real time text chat (with redundancy encoding) */
- [106] = {1, AST_FORMAT_T140}, /* Real time text chat */
+ [105] = {1, AST_FORMAT_T140RED}, /* Real time text chat (with redundancy encoding) */
+ [106] = {1, AST_FORMAT_T140}, /* Real time text chat */
[110] = {1, AST_FORMAT_SPEEX},
[111] = {1, AST_FORMAT_G726},
[112] = {1, AST_FORMAT_G726_AAL2},
[115] = {1, AST_FORMAT_SIREN14},
[116] = {1, AST_FORMAT_G719},
[117] = {1, AST_FORMAT_SPEEX16},
- [121] = {0, AST_RTP_CISCO_DTMF}, /* Must be type 121 */
+ [118] = {1, AST_FORMAT_SLINEAR16}, /* 16 Khz signed linear */
+ [121] = {0, AST_RTP_CISCO_DTMF}, /* Must be type 121 */
};
int ast_rtp_engine_register2(struct ast_rtp_engine *engine, struct ast_module *module)