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_g726.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_g726.c')
-rw-r--r-- | codecs/codec_g726.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/codecs/codec_g726.c b/codecs/codec_g726.c index cc9b1cb31..f8a57f740 100644 --- a/codecs/codec_g726.c +++ b/codecs/codec_g726.c @@ -771,8 +771,6 @@ static int lintog726_framein(struct ast_trans_pvt *pvt, struct ast_frame *f) static struct ast_translator g726tolin = { .name = "g726tolin", - .srcfmt = AST_FORMAT_G726, - .dstfmt = AST_FORMAT_SLINEAR, .newpvt = lintog726_new, /* same for both directions */ .framein = g726tolin_framein, .sample = g726_sample, @@ -783,8 +781,6 @@ static struct ast_translator g726tolin = { static struct ast_translator lintog726 = { .name = "lintog726", - .srcfmt = AST_FORMAT_SLINEAR, - .dstfmt = AST_FORMAT_G726, .newpvt = lintog726_new, /* same for both directions */ .framein = lintog726_framein, .sample = slin8_sample, @@ -795,8 +791,6 @@ static struct ast_translator lintog726 = { static struct ast_translator g726aal2tolin = { .name = "g726aal2tolin", - .srcfmt = AST_FORMAT_G726_AAL2, - .dstfmt = AST_FORMAT_SLINEAR, .newpvt = lintog726_new, /* same for both directions */ .framein = g726aal2tolin_framein, .sample = g726_sample, @@ -807,8 +801,6 @@ static struct ast_translator g726aal2tolin = { static struct ast_translator lintog726aal2 = { .name = "lintog726aal2", - .srcfmt = AST_FORMAT_SLINEAR, - .dstfmt = AST_FORMAT_G726_AAL2, .newpvt = lintog726_new, /* same for both directions */ .framein = lintog726aal2_framein, .sample = slin8_sample, @@ -839,6 +831,18 @@ static int load_module(void) { int res = 0; + ast_format_set(&g726tolin.src_format, AST_FORMAT_G726, 0); + ast_format_set(&g726tolin.dst_format, AST_FORMAT_SLINEAR, 0); + + ast_format_set(&lintog726.src_format, AST_FORMAT_SLINEAR, 0); + ast_format_set(&lintog726.dst_format, AST_FORMAT_G726, 0); + + ast_format_set(&g726aal2tolin.src_format, AST_FORMAT_G726_AAL2, 0); + ast_format_set(&g726aal2tolin.dst_format, AST_FORMAT_SLINEAR, 0); + + ast_format_set(&lintog726aal2.src_format, AST_FORMAT_SLINEAR, 0); + ast_format_set(&lintog726aal2.dst_format, AST_FORMAT_G726_AAL2, 0); + res |= ast_register_translator(&g726tolin); res |= ast_register_translator(&lintog726); |