diff options
| author | Tom Hughes <tom@compton.nu> | 2018-10-25 18:27:20 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2018-10-27 06:52:37 +0000 |
| commit | 27070dd05964823adefbd159595e61b515c52e49 (patch) | |
| tree | d6484bafbb795080eeccf96edf0f7c34601a56e4 /epan/iax2_codec_type.h | |
| parent | 99c62bf79710a8fa97d368fa0b2c54b9d1cc6484 (diff) | |
IAX: Improve decoding of IAX2 codec details
This adds a number of new codecs and extends the dissector
to handle 64 bit codec masks correctly.
Change-Id: Ib9ad5d178db269ba56bbac8ef6429cca49f6fc33
Reviewed-on: https://code.wireshark.org/review/30384
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/iax2_codec_type.h')
| -rw-r--r-- | epan/iax2_codec_type.h | 68 |
1 files changed, 37 insertions, 31 deletions
diff --git a/epan/iax2_codec_type.h b/epan/iax2_codec_type.h index 3604cf247f..84465b02c3 100644 --- a/epan/iax2_codec_type.h +++ b/epan/iax2_codec_type.h @@ -12,64 +12,70 @@ #define __IAX2_CODEC_TYPE_H__ -/* Ref: frame.h from Asterisk source */ +/* Ref: format_compatibility.h from Asterisk source */ /* Data formats for capabilities and frames alike */ /* suitable for use in iax2.codec dissector table */ /*! G.723.1 compression */ -#define AST_FORMAT_G723_1 (1 << 0) +#define AST_FORMAT_G723_1 0 /*! GSM compression */ -#define AST_FORMAT_GSM (1 << 1) +#define AST_FORMAT_GSM 1 /*! Raw mu-law data (G.711) */ -#define AST_FORMAT_ULAW (1 << 2) +#define AST_FORMAT_ULAW 2 /*! Raw A-law data (G.711) */ -#define AST_FORMAT_ALAW (1 << 3) -/*! ADPCM (G.726, 32kbps) */ -#define AST_FORMAT_G726_AAL2 (1 << 4) +#define AST_FORMAT_ALAW 3 +/*! ADPCM (G.726, 32kbps, AAL2 codeword packing) */ +#define AST_FORMAT_G726_AAL2 4 /*! ADPCM (IMA) */ -#define AST_FORMAT_ADPCM (1 << 5) +#define AST_FORMAT_ADPCM 5 /*! Raw 16-bit Signed Linear (8000 Hz) PCM */ -#define AST_FORMAT_SLINEAR (1 << 6) +#define AST_FORMAT_SLINEAR 6 /*! LPC10, 180 samples/frame */ -#define AST_FORMAT_LPC10 (1 << 7) +#define AST_FORMAT_LPC10 7 /*! G.729A audio */ -#define AST_FORMAT_G729A (1 << 8) +#define AST_FORMAT_G729A 8 /*! SpeeX Free Compression */ -#define AST_FORMAT_SPEEX (1 << 9) +#define AST_FORMAT_SPEEX 9 /*! iLBC Free Compression */ -#define AST_FORMAT_ILBC (1 << 10) +#define AST_FORMAT_ILBC 10 /*! ADPCM (G.726, 32kbps, RFC3551 codeword packing) */ -#define AST_FORMAT_G726 (1 << 11) +#define AST_FORMAT_G726 11 /*! G.722 */ -#define AST_FORMAT_G722 (1 << 12) +#define AST_FORMAT_G722 12 /*! G.722.1 (also known as Siren7, 32kbps assumed) */ -#define AST_FORMAT_SIREN7 (1 << 13) +#define AST_FORMAT_SIREN7 13 /*! G.722.1 Annex C (also known as Siren14, 48kbps assumed) */ -#define AST_FORMAT_SIREN14 (1 << 14) +#define AST_FORMAT_SIREN14 14 /*! Raw 16-bit Signed Linear (16000 Hz) PCM */ -#define AST_FORMAT_SLINEAR16 (1 << 15) -/*! Maximum audio format */ -#define AST_FORMAT_MAX_AUDIO (1 << 15) +#define AST_FORMAT_SLINEAR16 15 /*! JPEG Images */ -#define AST_FORMAT_JPEG (1 << 16) +#define AST_FORMAT_JPEG 16 /*! PNG Images */ -#define AST_FORMAT_PNG (1 << 17) +#define AST_FORMAT_PNG 17 /*! H.261 Video */ -#define AST_FORMAT_H261 (1 << 18) +#define AST_FORMAT_H261 18 /*! H.263 Video */ -#define AST_FORMAT_H263 (1 << 19) +#define AST_FORMAT_H263 19 /*! H.263+ Video */ -#define AST_FORMAT_H263_PLUS (1 << 20) +#define AST_FORMAT_H263_PLUS 20 /*! H.264 Video */ -#define AST_FORMAT_H264 (1 << 21) +#define AST_FORMAT_H264 21 /*! MPEG4 Video */ -#define AST_FORMAT_MP4_VIDEO (1 << 22) -/*! Max one */ -#define AST_FORMAT_MAX_VIDEO (1 << 24) +#define AST_FORMAT_MP4_VIDEO 22 +/*! VP8 Video */ +#define AST_FORMAT_VP8 23 +/*! T.140 RED Text format RFC 4103 */ +#define AST_FORMAT_T140_RED 26 +/*! T.140 Text format - ITU T.140, RFC 4103 */ +#define AST_FORMAT_T140 27 /*! G.719 (64 kbps assumed) */ -#define AST_FORMAT_G719 (1 << 32) +#define AST_FORMAT_G719 32 /*! SpeeX Wideband (16kHz) Free Compression */ -#define AST_FORMAT_SPEEX16 (1 << 33) +#define AST_FORMAT_SPEEX16 33 +/*! Opus audio (8kHz, 16kHz, 24kHz, 48Khz) */ +#define AST_FORMAT_OPUS 34 +/*! Raw testing-law data (G.711) */ +#define AST_FORMAT_TESTLAW 47 /* data format for IAX_IE_DATAFORMAT ie */ |