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 /channels/iax2-provision.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 'channels/iax2-provision.c')
| -rw-r--r-- | channels/iax2-provision.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/channels/iax2-provision.c b/channels/iax2-provision.c index c7af9f324..a95098236 100644 --- a/channels/iax2-provision.c +++ b/channels/iax2-provision.c @@ -59,7 +59,7 @@ struct iax_template { unsigned short serverport; unsigned int altserver; unsigned int flags; - unsigned int format; + iax2_format format; unsigned int tos; AST_LIST_ENTRY(iax_template) list; }; @@ -340,8 +340,9 @@ static int iax_template_parse(struct iax_template *cur, struct ast_config *cfg, } else ast_log(LOG_WARNING, "Ignoring invalid %s '%s' for '%s' at line %d\n", v->name, v->value, s, v->lineno); } else if (!strcasecmp(v->name, "codec")) { - if ((x = ast_getformatbyname(v->value)) > 0) { - cur->format = x; + struct ast_format tmpfmt; + if ((ast_getformatbyname(v->value, &tmpfmt)) > 0) { + cur->format = ast_format_to_old_bitfield(&tmpfmt); } else ast_log(LOG_WARNING, "Ignoring invalid codec '%s' for '%s' at line %d\n", v->value, s, v->lineno); } else if (!strcasecmp(v->name, "tos")) { @@ -468,7 +469,7 @@ static char *iax_show_provisioning(struct ast_cli_entry *e, int cmd, struct ast_ ast_cli(a->fd, "Server Port: %d\n", cur->serverport); ast_cli(a->fd, "Alternate: %s\n", alternate); ast_cli(a->fd, "Flags: %s\n", iax_provflags2str(flags, sizeof(flags), cur->flags)); - ast_cli(a->fd, "Format: %s\n", ast_getformatname(cur->format)); + ast_cli(a->fd, "Format: %s\n", iax2_getformatname(cur->format)); ast_cli(a->fd, "TOS: 0x%x\n", cur->tos); found++; } |