diff options
| author | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-02-20 20:34:11 +0000 |
|---|---|---|
| committer | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-02-20 20:34:11 +0000 |
| commit | f8e44a9881b33ce61e0e8992c6ca73fd70ad247c (patch) | |
| tree | c5900d9cecb14c8decbb284765308a034d9c0fc9 /include | |
| parent | 524625a2643c949cdf1a0775dd6c4ff1e8b1c68c (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 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.1@177700 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include')
| -rw-r--r-- | include/asterisk/frame.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asterisk/frame.h b/include/asterisk/frame.h index 2f3c7851f..d7d895b25 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 */ |