aboutsummaryrefslogtreecommitdiffstats
path: root/channel.c
diff options
context:
space:
mode:
authorkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2006-07-12 22:42:13 +0000
committerkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2006-07-12 22:42:13 +0000
commitb2b23b395d856d8c40461ce058f870a02fd4305b (patch)
treee06b1f2c7758b2894dc49f0354dd14e1762a5192 /channel.c
parent1a6178125db27fcbf0e01c32fc0aa9ee080ca312 (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 'channel.c')
-rw-r--r--channel.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/channel.c b/channel.c
index cf3680744..c14c47ce6 100644
--- a/channel.c
+++ b/channel.c
@@ -546,8 +546,10 @@ int ast_best_codec(int fmts)
AST_FORMAT_ALAW,
/*! Okay, well, signed linear is easy to translate into other stuff */
AST_FORMAT_SLINEAR,
- /*! G.726 is standard ADPCM */
+ /*! G.726 is standard ADPCM, in RFC3551 packing order */
AST_FORMAT_G726,
+ /*! G.726 is standard ADPCM, in AAL2 packing order */
+ AST_FORMAT_G726_AAL2,
/*! ADPCM has great sound quality and is still pretty easy to translate */
AST_FORMAT_ADPCM,
/*! Okay, we're down to vocoders now, so pick GSM because it's small and easier to