aboutsummaryrefslogtreecommitdiffstats
path: root/include
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 /include
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 'include')
-rw-r--r--include/asterisk/frame.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/asterisk/frame.h b/include/asterisk/frame.h
index 24b7cb745..709175d68 100644
--- a/include/asterisk/frame.h
+++ b/include/asterisk/frame.h
@@ -214,7 +214,7 @@ extern struct ast_frame ast_null_frame;
#define AST_FORMAT_ULAW (1 << 2)
/*! Raw A-law data (G.711) */
#define AST_FORMAT_ALAW (1 << 3)
-/*! ADPCM (G.726, 32kbps) */
+/*! ADPCM (G.726, 32kbps, RFC3551 codeword packing) */
#define AST_FORMAT_G726 (1 << 4)
/*! ADPCM (IMA) */
#define AST_FORMAT_ADPCM (1 << 5)
@@ -228,6 +228,8 @@ extern struct ast_frame ast_null_frame;
#define AST_FORMAT_SPEEX (1 << 9)
/*! iLBC Free Compression */
#define AST_FORMAT_ILBC (1 << 10)
+/*! ADPCM (G.726, 32kbps, AAL2 codeword packing) */
+#define AST_FORMAT_G726_AAL2 (1 << 11)
/*! Maximum audio format */
#define AST_FORMAT_MAX_AUDIO (1 << 15)
/*! Maximum audio mask */