dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

Merged revisions 46714 via svnmerge from 

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r46714 | kpfleming | 2006-10-31 15:47:48 -0600 (Tue, 31 Oct 2006) | 2 lines

add an API so that translators can activate/deactivate themselves when needed

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@46719 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
kpfleming 2006-10-31 22:19:08 +00:00
parent 099d00732e
commit 05411ca878
2 changed files with 56 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
include/asterisk/translate.h
View File

@ -108,6 +108,7 @@ struct ast_translator {
struct ast_module *module; /* opaque reference to the parent module */
int cost; /*!< Cost in milliseconds for encoding/decoding 1 second of sound */
int active; /*!< Whether this translator should be used or not */
AST_LIST_ENTRY(ast_translator) list; /*!< link field */
};
@ -166,6 +167,24 @@ int __ast_register_translator(struct ast_translator *t, struct ast_module *modul
*/
int ast_unregister_translator(struct ast_translator *t);
/*!
* \brief Activate a previously deactivated translator
* \param t translator to activate
* \return nothing
*
* Enables the specified translator for use.
*/
void ast_translator_activate(struct ast_translator *t);
/*!
* \brief Deactivate a translator
* \param t translator to deactivate
* \return nothing
*
* Disables the specified translator from being used.
*/
void ast_translator_deactivate(struct ast_translator *t);
/*!
* \brief Chooses the best translation path
*

43
main/translate.c
View File

@ -427,6 +427,9 @@ static void rebuild_matrix(int samples)
/* first, compute all direct costs */
AST_LIST_TRAVERSE(&translators, t, list) {
if (!t->active)
continue;
x = t->srcfmt;
z = t->dstfmt;
@ -582,6 +585,11 @@ int __ast_register_translator(struct ast_translator *t, struct ast_module *mod)
}
t->module = mod;
t->srcfmt = powerof(t->srcfmt);
t->dstfmt = powerof(t->dstfmt);
t->active = 1;
if (t->plc_samples) {
if (t->buffer_samples < t->plc_samples) {
ast_log(LOG_WARNING, "plc_samples %d buffer_samples %d\n",
@ -592,17 +600,16 @@ int __ast_register_translator(struct ast_translator *t, struct ast_module *mod)
ast_log(LOG_WARNING, "plc_samples %d format %x\n",
t->plc_samples, t->dstfmt);
}
t->srcfmt = powerof(t->srcfmt);
t->dstfmt = powerof(t->dstfmt);
/* XXX maybe check that it is not existing yet ? */
if (t->srcfmt >= MAX_FORMAT) {
ast_log(LOG_WARNING, "Source format %s is larger than MAX_FORMAT\n", ast_getformatname(t->srcfmt));
return -1;
}
if (t->dstfmt >= MAX_FORMAT) {
ast_log(LOG_WARNING, "Destination format %s is larger than MAX_FORMAT\n", ast_getformatname(t->dstfmt));
return -1;
}
if (t->buf_size) {
/*
* Align buf_size properly, rounding up to the machine-specific
@ -610,24 +617,30 @@ int __ast_register_translator(struct ast_translator *t, struct ast_module *mod)
*/
struct _test_align { void *a, *b; } p;
int align = (char *)&p.b - (char *)&p.a;
t->buf_size = ((t->buf_size + align - 1) / align) * align;
}
if (t->frameout == NULL)
t->frameout = default_frameout;
calc_cost(t, 1);
if (option_verbose > 1) {
char tmp[80];
ast_verbose(VERBOSE_PREFIX_2 "Registered translator '%s' from format %s to %s, cost %d\n",
term_color(tmp, t->name, COLOR_MAGENTA, COLOR_BLACK, sizeof(tmp)),
ast_getformatname(1 << t->srcfmt), ast_getformatname(1 << t->dstfmt), t->cost);
term_color(tmp, t->name, COLOR_MAGENTA, COLOR_BLACK, sizeof(tmp)),
ast_getformatname(1 << t->srcfmt), ast_getformatname(1 << t->dstfmt), t->cost);
}
AST_LIST_LOCK(&translators);
if (!added_cli) {
ast_cli_register_multiple(cli_translate, sizeof(cli_translate) / sizeof(struct ast_cli_entry));
added_cli++;
}
AST_LIST_LOCK(&translators);
/* find any existing translators that provide this same srcfmt/dstfmt,
and put this one in order based on cost */
AST_LIST_TRAVERSE_SAFE_BEGIN(&translators, u, list) {
@ -646,7 +659,9 @@ int __ast_register_translator(struct ast_translator *t, struct ast_module *mod)
AST_LIST_INSERT_HEAD(&translators, t, list);
rebuild_matrix(0);
AST_LIST_UNLOCK(&translators);
return 0;
}
@ -677,6 +692,22 @@ int ast_unregister_translator(struct ast_translator *t)
return (u ? 0 : -1);
}
void ast_translator_activate(struct ast_translator *t)
{
AST_LIST_LOCK(&translators);
t->active = 1;
rebuild_matrix(0);
AST_LIST_UNLOCK(&translators);
}
void ast_translator_deactivate(struct ast_translator *t)
{
AST_LIST_LOCK(&translators);
t->active = 0;
rebuild_matrix(0);
AST_LIST_UNLOCK(&translators);
}
/*! \brief Calculate our best translator source format, given costs, and a desired destination */
int ast_translator_best_choice(int *dst, int *srcs)
{