From c99f5359c622c8d2e9a2da63a6be96f11950b236 Mon Sep 17 00:00:00 2001
From: Automerge script <automerge@asterisk.org>
Date: Fri, 14 Dec 2012 01:17:36 +0000
Subject: [PATCH] Merged revisions 378006 via svnmerge from
file:///srv/subversion/repos/asterisk/trunk
........
r378006 | wedhorn | 2012-12-13 19:02:15 -0600 (Thu, 13 Dec 2012) | 8 lines
Add g722 codec support to skinny
(closes issue AST-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/team/mmichelson/threadpool@378007 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
channels/chan_skinny.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c
index 1b2c170025..bd24c6a056 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:
--
GitLab