diff options
author | David Vossel <dvossel@digium.com> | 2011-02-03 16:22:10 +0000 |
---|---|---|
committer | David Vossel <dvossel@digium.com> | 2011-02-03 16:22:10 +0000 |
commit | c26c190711a1bbe3b5fff1a93facae333757c56e (patch) | |
tree | 00da0caa5a07b7b25729f089dbcafb08129fa9be /codecs/codec_adpcm.c | |
parent | 652fb64a01c7a8656697d07e606620ee0ced6929 (diff) |
Asterisk media architecture conversion - no more format bitfields
This patch is the foundation of an entire new way of looking at media in Asterisk.
The code present in this patch is everything required to complete phase1 of my
Media Architecture proposal. For more information about this project visit the link below.
https://wiki.asterisk.org/wiki/display/AST/Media+Architecture+Proposal
The primary function of this patch is to convert all the usages of format
bitfields in Asterisk to use the new format and format_cap APIs. Functionally
no change in behavior should be present in this patch. Thanks to twilson
and russell for all the time they spent reviewing these changes.
Review: https://reviewboard.asterisk.org/r/1083/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@306010 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'codecs/codec_adpcm.c')
-rw-r--r-- | codecs/codec_adpcm.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/codecs/codec_adpcm.c b/codecs/codec_adpcm.c index a1b0680a5..63745c170 100644 --- a/codecs/codec_adpcm.c +++ b/codecs/codec_adpcm.c @@ -286,8 +286,6 @@ static struct ast_frame *lintoadpcm_frameout(struct ast_trans_pvt *pvt) static struct ast_translator adpcmtolin = { .name = "adpcmtolin", - .srcfmt = AST_FORMAT_ADPCM, - .dstfmt = AST_FORMAT_SLINEAR, .framein = adpcmtolin_framein, .sample = adpcm_sample, .desc_size = sizeof(struct adpcm_decoder_pvt), @@ -297,8 +295,6 @@ static struct ast_translator adpcmtolin = { static struct ast_translator lintoadpcm = { .name = "lintoadpcm", - .srcfmt = AST_FORMAT_SLINEAR, - .dstfmt = AST_FORMAT_ADPCM, .framein = lintoadpcm_framein, .frameout = lintoadpcm_frameout, .sample = slin8_sample, @@ -327,6 +323,12 @@ static int load_module(void) { int res; + ast_format_set(&adpcmtolin.src_format, AST_FORMAT_ADPCM, 0); + ast_format_set(&adpcmtolin.dst_format, AST_FORMAT_SLINEAR, 0); + + ast_format_set(&lintoadpcm.src_format, AST_FORMAT_SLINEAR, 0); + ast_format_set(&lintoadpcm.dst_format, AST_FORMAT_ADPCM, 0); + res = ast_register_translator(&adpcmtolin); if (!res) res = ast_register_translator(&lintoadpcm); |