diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-10-25 00:26:17 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-10-25 00:26:17 +0000 |
| commit | cec97ad9e6af609b380638ae925c761a436d5e2d (patch) | |
| tree | c5fba23cdf2823e522b09d655d337c60dd46174b /channels | |
| parent | d51feffdaff85b820880b7646cb3a461938579e8 (diff) | |
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/branches/1.4@46154 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_h323.c | 2 | ||||
| -rw-r--r-- | channels/chan_iax2.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/channels/chan_h323.c b/channels/chan_h323.c index 5a7bbc901..ef08d20be 100644 --- a/channels/chan_h323.c +++ b/channels/chan_h323.c @@ -2995,6 +2995,8 @@ static char *convertcap(int cap) return "ULAW"; case AST_FORMAT_ALAW: return "ALAW"; + case AST_FORMAT_G722: + return "G.722"; case AST_FORMAT_ADPCM: return "G.728"; case AST_FORMAT_G729A: diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 4c9f239b7..5a4ed3cd4 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -183,7 +183,8 @@ int (*iax2_regfunk)(const char *username, int onoff) = NULL; #define IAX_CAPABILITY_MEDBANDWIDTH (IAX_CAPABILITY_FULLBANDWIDTH & \ ~AST_FORMAT_SLINEAR & \ ~AST_FORMAT_ULAW & \ - ~AST_FORMAT_ALAW) + ~AST_FORMAT_ALAW & \ + ~AST_FORMAT_G722) /* A modem */ #define IAX_CAPABILITY_LOWBANDWIDTH (IAX_CAPABILITY_MEDBANDWIDTH & \ ~AST_FORMAT_G726 & \ |