kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 12:16:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 378006 via svnmerge from

Browse Source 
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
This commit is contained in:
Automerge script
2012-12-14 01:17:36 +00:00
parent 5af578c022
commit c99f5359c6
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
channels/chan_skinny.c
View File

@@ -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: