diff options
| author | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-02-20 20:27:45 +0000 |
|---|---|---|
| committer | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-02-20 20:27:45 +0000 |
| commit | 62ed8d0e6dc9421be2d0bb7287ff38c7448357c8 (patch) | |
| tree | da7247f99786dacabf584d08336dd431a5df5cd7 | |
| parent | f3d699283df5929c3c91e6873dec74227cca037a (diff) | |
Fixes issue with undefined audio codecs in chan_iax2
During iax2 call negotiation, supported codecs are passed in an Information Element containing a 2 byte field where each bit correlates to a specific codec. In 1.6 only audio codec bits 0-12 and 15 are defined, leaving bits 13-14 undefined. By default all bits are enabled unless specified otherwise. Since its a 2 byte field and 13-14 are not defined, these bits are never turned off. In trunk, bits 13-14 are defined, which means 1.6 is advertising support for codecs it does not have when talking to trunk. I fixed this by adding #define for undefined audio codec bits. These bits are then removed from iax2's full bandwidth capabilities.
(closes issue #14283)
Reported by: jcovert
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@177698 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/chan_iax2.c | 2 | ||||
| -rw-r--r-- | include/asterisk/frame.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index a5447022d..675b843d5 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -185,7 +185,7 @@ static int defaultsockfd = -1; int (*iax2_regfunk)(const char *username, int onoff) = NULL; /* Ethernet, etc */ -#define IAX_CAPABILITY_FULLBANDWIDTH 0xFFFF +#define IAX_CAPABILITY_FULLBANDWIDTH (0xFFFF & ~AST_FORMAT_AUDIO_UNDEFINED) /* T1, maybe ISDN */ #define IAX_CAPABILITY_MEDBANDWIDTH (IAX_CAPABILITY_FULLBANDWIDTH & \ ~AST_FORMAT_SLINEAR & \ diff --git a/include/asterisk/frame.h b/include/asterisk/frame.h index 892a531b6..c866cf743 100644 --- a/include/asterisk/frame.h +++ b/include/asterisk/frame.h @@ -267,6 +267,8 @@ extern struct ast_frame ast_null_frame; #define AST_FORMAT_G726 (1 << 11) /*! G.722 */ #define AST_FORMAT_G722 (1 << 12) +/*! Unsupported audio bits */ +#define AST_FORMAT_AUDIO_UNDEFINED ((1 << 13) | (1 << 14)) /*! Raw 16-bit Signed Linear (16000 Hz) PCM */ #define AST_FORMAT_SLINEAR16 (1 << 15) /*! Maximum audio mask */ |