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 /main/data.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 'main/data.c')
-rw-r--r-- | main/data.c | 33 |
1 files changed, 31 insertions, 2 deletions
diff --git a/main/data.c b/main/data.c index 3b2c124ab..3ca2f7c27 100644 --- a/main/data.c +++ b/main/data.c @@ -3100,7 +3100,7 @@ static int manager_data_get(struct mansession *s, const struct message *m) return RESULT_SUCCESS; } -int ast_data_add_codecs(struct ast_data *root, const char *node_name, format_t capability) +int ast_data_add_codec(struct ast_data *root, const char *node_name, struct ast_format *format) { struct ast_data *codecs, *codec; size_t fmlist_size; @@ -3113,7 +3113,36 @@ int ast_data_add_codecs(struct ast_data *root, const char *node_name, format_t c } fmlist = ast_get_format_list(&fmlist_size); for (x = 0; x < fmlist_size; x++) { - if (fmlist[x].bits & capability) { + if (fmlist[x].id == format->id) { + codec = ast_data_add_node(codecs, "codec"); + if (!codec) { + return -1; + } + ast_data_add_str(codec, "name", fmlist[x].name); + ast_data_add_int(codec, "samplespersecond", fmlist[x].samplespersecond); + ast_data_add_str(codec, "description", fmlist[x].desc); + ast_data_add_int(codec, "frame_length", fmlist[x].fr_len); + } + } + + return 0; +} + +int ast_data_add_codecs(struct ast_data *root, const char *node_name, struct ast_format_cap *cap) +{ + struct ast_data *codecs, *codec; + size_t fmlist_size; + const struct ast_format_list *fmlist; + struct ast_format tmp_fmt; + int x; + + codecs = ast_data_add_node(root, node_name); + if (!codecs) { + return -1; + } + fmlist = ast_get_format_list(&fmlist_size); + for (x = 0; x < fmlist_size; x++) { + if (ast_format_cap_iscompatible(cap, ast_format_set(&tmp_fmt, fmlist[x].id, 0))) { codec = ast_data_add_node(codecs, "codec"); if (!codec) { return -1; |