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 /res/res_clioriginate.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 'res/res_clioriginate.c')
| -rw-r--r-- | res/res_clioriginate.c | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/res/res_clioriginate.c b/res/res_clioriginate.c index 01cf9f7b7..f244c165d 100644 --- a/res/res_clioriginate.c +++ b/res/res_clioriginate.c @@ -52,6 +52,8 @@ static char *orig_app(int fd, const char *chan, const char *app, const char *app char *chantech; char *chandata; int reason = 0; + struct ast_format_cap *cap; + struct ast_format tmpfmt; if (ast_strlen_zero(app)) return CLI_SHOWUSAGE; @@ -64,7 +66,12 @@ static char *orig_app(int fd, const char *chan, const char *app, const char *app return CLI_SHOWUSAGE; } - ast_pbx_outgoing_app(chantech, AST_FORMAT_SLINEAR, chandata, TIMEOUT * 1000, app, appdata, &reason, 0, NULL, NULL, NULL, NULL, NULL); + if (!(cap = ast_format_cap_alloc_nolock())) { + return CLI_FAILURE; + } + ast_format_cap_add(cap, ast_format_set(&tmpfmt, AST_FORMAT_SLINEAR, 0)); + ast_pbx_outgoing_app(chantech, cap, chandata, TIMEOUT * 1000, app, appdata, &reason, 0, NULL, NULL, NULL, NULL, NULL); + cap = ast_format_cap_destroy(cap); return CLI_SUCCESS; } @@ -84,6 +91,8 @@ static char *orig_exten(int fd, const char *chan, const char *data) char *exten = NULL; char *context = NULL; int reason = 0; + struct ast_format_cap *cap; + struct ast_format tmpfmt; chandata = ast_strdupa(chan); @@ -102,8 +111,12 @@ static char *orig_exten(int fd, const char *chan, const char *data) exten = "s"; if (ast_strlen_zero(context)) context = "default"; - - ast_pbx_outgoing_exten(chantech, AST_FORMAT_SLINEAR, chandata, TIMEOUT * 1000, context, exten, 1, &reason, 0, NULL, NULL, NULL, NULL, NULL); + if (!(cap = ast_format_cap_alloc_nolock())) { + return CLI_FAILURE; + } + ast_format_cap_add(cap, ast_format_set(&tmpfmt, AST_FORMAT_SLINEAR, 0)); + ast_pbx_outgoing_exten(chantech, cap, chandata, TIMEOUT * 1000, context, exten, 1, &reason, 0, NULL, NULL, NULL, NULL, NULL); + cap = ast_format_cap_destroy(cap); return CLI_SUCCESS; } |