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_g722.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_g722.c')
| -rw-r--r-- | codecs/codec_g722.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/codecs/codec_g722.c b/codecs/codec_g722.c index 22196da01..9c3a01846 100644 --- a/codecs/codec_g722.c +++ b/codecs/codec_g722.c @@ -134,8 +134,6 @@ static int lintog722_framein(struct ast_trans_pvt *pvt, struct ast_frame *f) static struct ast_translator g722tolin = { .name = "g722tolin", - .srcfmt = AST_FORMAT_G722, - .dstfmt = AST_FORMAT_SLINEAR, .newpvt = g722tolin_new, /* same for both directions */ .framein = g722tolin_framein, .sample = g722_sample, @@ -146,8 +144,6 @@ static struct ast_translator g722tolin = { static struct ast_translator lintog722 = { .name = "lintog722", - .srcfmt = AST_FORMAT_SLINEAR, - .dstfmt = AST_FORMAT_G722, .newpvt = lintog722_new, /* same for both directions */ .framein = lintog722_framein, .sample = slin8_sample, @@ -158,8 +154,6 @@ static struct ast_translator lintog722 = { static struct ast_translator g722tolin16 = { .name = "g722tolin16", - .srcfmt = AST_FORMAT_G722, - .dstfmt = AST_FORMAT_SLINEAR16, .newpvt = g722tolin16_new, /* same for both directions */ .framein = g722tolin_framein, .sample = g722_sample, @@ -170,8 +164,6 @@ static struct ast_translator g722tolin16 = { static struct ast_translator lin16tog722 = { .name = "lin16tog722", - .srcfmt = AST_FORMAT_SLINEAR16, - .dstfmt = AST_FORMAT_G722, .newpvt = lin16tog722_new, /* same for both directions */ .framein = lintog722_framein, .sample = slin16_sample, @@ -201,6 +193,18 @@ static int load_module(void) { int res = 0; + ast_format_set(&g722tolin.src_format, AST_FORMAT_G722, 0); + ast_format_set(&g722tolin.dst_format, AST_FORMAT_SLINEAR, 0); + + ast_format_set(&lintog722.src_format, AST_FORMAT_SLINEAR, 0); + ast_format_set(&lintog722.dst_format, AST_FORMAT_G722, 0); + + ast_format_set(&g722tolin16.src_format, AST_FORMAT_G722, 0); + ast_format_set(&g722tolin16.dst_format, AST_FORMAT_SLINEAR16, 0); + + ast_format_set(&lin16tog722.src_format, AST_FORMAT_SLINEAR16, 0); + ast_format_set(&lin16tog722.dst_format, AST_FORMAT_G722, 0); + res |= ast_register_translator(&g722tolin); res |= ast_register_translator(&lintog722); res |= ast_register_translator(&g722tolin16); |