diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-07-12 22:42:13 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-07-12 22:42:13 +0000 |
| commit | b2b23b395d856d8c40461ce058f870a02fd4305b (patch) | |
| tree | e06b1f2c7758b2894dc49f0354dd14e1762a5192 /frame.c | |
| parent | 1a6178125db27fcbf0e01c32fc0aa9ee080ca312 (diff) | |
G726-32 changes:
split support for G726-32 into RFC3551 and AAL2 packing orders, since both are in use
change "G726-32" to be RFC3551 packing order, in spite of devices that use AAL2 order with this MIME type
add ability to directly transcode between packing orders
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@37494 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'frame.c')
| -rw-r--r-- | frame.c | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -81,17 +81,18 @@ static struct ast_format_list { char *name; /*!< short name */ char *desc; /*!< Description */ } AST_FORMAT_LIST[] = { /*!< Bit number: comment - Bit numbers are hard coded in show_codec() */ - { 1, AST_FORMAT_G723_1 , "g723" , "G.723.1"}, /*!< 1: codec_g723_1.c */ + { 1, AST_FORMAT_G723_1 , "g723" , "G.723.1"}, /*!< 1 */ { 1, AST_FORMAT_GSM, "gsm" , "GSM"}, /*!< 2: codec_gsm.c */ { 1, AST_FORMAT_ULAW, "ulaw", "G.711 u-law" }, /*!< 3: codec_ulaw.c */ { 1, AST_FORMAT_ALAW, "alaw", "G.711 A-law" }, /*!< 4: codec_alaw.c */ - { 1, AST_FORMAT_G726, "g726", "G.726" }, /*!< 5: codec_g726.c */ + { 1, AST_FORMAT_G726, "g726", "G.726 RFC3551" },/*!< 5: codec_g726.c */ { 1, AST_FORMAT_ADPCM, "adpcm" , "ADPCM"}, /*!< 6: codec_adpcm.c */ { 1, AST_FORMAT_SLINEAR, "slin", "16 bit Signed Linear PCM"}, /*!< 7 */ { 1, AST_FORMAT_LPC10, "lpc10", "LPC10" }, /*!< 8: codec_lpc10.c */ { 1, AST_FORMAT_G729A, "g729", "G.729A" }, /*!< 9: Binary commercial distribution */ { 1, AST_FORMAT_SPEEX, "speex", "SpeeX" }, /*!< 10: codec_speex.c */ { 1, AST_FORMAT_ILBC, "ilbc", "iLBC"}, /*!< 11: codec_ilbc.c */ + { 1, AST_FORMAT_G726_AAL2, "g726aal2", "G.726 AAL2" }, /*!< 12: codec_g726.c */ { 0, 0, "nothing", "undefined" }, { 0, 0, "nothing", "undefined" }, { 0, 0, "nothing", "undefined" }, @@ -1255,6 +1256,7 @@ int ast_codec_get_samples(struct ast_frame *f) break; case AST_FORMAT_ADPCM: case AST_FORMAT_G726: + case AST_FORMAT_G726_AAL2: samples = f->datalen * 2; break; default: @@ -1287,6 +1289,7 @@ int ast_codec_get_len(int format, int samples) break; case AST_FORMAT_ADPCM: case AST_FORMAT_G726: + case AST_FORMAT_G726_AAL2: len = samples / 2; break; default: |