summaryrefslogtreecommitdiff
path: root/channels/chan_skinny.c
diff options
context:
space:
mode:
authorDamien Wedhorn <voip@facts.com.au>2012-12-14 01:02:15 +0000
committerDamien Wedhorn <voip@facts.com.au>2012-12-14 01:02:15 +0000
commitb514659d1c94430dba0e6aa95735fd6c15a85b19 (patch)
tree515851d3a74ef3a0202021e2773cc615cb5ae78e /channels/chan_skinny.c
parentb17f7cab952f61ce35bc62d227103ca6e8a94980 (diff)
Add g722 codec support to skinny
(closes issue ASTERISK-20788) Reported by: snuffy Tested by: snuffy, myself Patches: skinny-g722.diff uploaded by snuffy (license 5024) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@378006 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_skinny.c')
-rw-r--r--channels/chan_skinny.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c
index 1b2c17002..bd24c6a05 100644
--- a/channels/chan_skinny.c
+++ b/channels/chan_skinny.c
@@ -175,6 +175,7 @@ static struct ast_codec_pref default_prefs;
enum skinny_codecs {
SKINNY_CODEC_ALAW = 2,
SKINNY_CODEC_ULAW = 4,
+ SKINNY_CODEC_G722 = 6,
SKINNY_CODEC_G723_1 = 9,
SKINNY_CODEC_G729A = 12,
SKINNY_CODEC_G726_32 = 82, /* XXX Which packing order does this translate to? */
@@ -1939,6 +1940,8 @@ static struct ast_format *codec_skinny2ast(enum skinny_codecs skinnycodec, struc
return ast_format_set(result, AST_FORMAT_ALAW, 0);
case SKINNY_CODEC_ULAW:
return ast_format_set(result, AST_FORMAT_ULAW, 0);
+ case SKINNY_CODEC_G722:
+ return ast_format_set(result, AST_FORMAT_G722, 0);
case SKINNY_CODEC_G723_1:
return ast_format_set(result, AST_FORMAT_G723_1, 0);
case SKINNY_CODEC_G729A:
@@ -1962,6 +1965,8 @@ static int codec_ast2skinny(const struct ast_format *astcodec)
return SKINNY_CODEC_ALAW;
case AST_FORMAT_ULAW:
return SKINNY_CODEC_ULAW;
+ case AST_FORMAT_G722:
+ return SKINNY_CODEC_G722;
case AST_FORMAT_G723_1:
return SKINNY_CODEC_G723_1;
case AST_FORMAT_G729A: