kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-09 11:28:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

revert changes that were the wrong way to address this... proper fix coming

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@46713 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2006-10-31 21:36:17 +00:00
parent f725940328
commit 160a0448c2
2 changed files with 41 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/asterisk/translate.h
View File

@@ -108,7 +108,6 @@ struct ast_translator {
struct ast_module *module; /* opaque reference to the parent module */ struct ast_module *module; /* opaque reference to the parent module */
int cost; /*!< Cost in milliseconds for encoding/decoding 1 second of sound */ int cost; /*!< Cost in milliseconds for encoding/decoding 1 second of sound */
int seen; /*!< If we have seen this translator before (optimize re-registration) */
AST_LIST_ENTRY(ast_translator) list; /*!< link field */ AST_LIST_ENTRY(ast_translator) list; /*!< link field */
}; };

11
main/translate.c
View File

@@ -650,9 +650,6 @@ int __ast_register_translator(struct ast_translator *t, struct ast_module *mod)
return -1; return -1;
} }
if (!t->seen) {
t->seen = 1;
if (!t->buf_size) { if (!t->buf_size) {
ast_log(LOG_WARNING, "empty buf size, you need to supply one\n"); ast_log(LOG_WARNING, "empty buf size, you need to supply one\n");
return -1; return -1;
@@ -693,22 +690,18 @@ int __ast_register_translator(struct ast_translator *t, struct ast_module *mod)
t->frameout = default_frameout; t->frameout = default_frameout;
calc_cost(t, 1); calc_cost(t, 1);
}
if (option_verbose > 1) { if (option_verbose > 1) {
char tmp[80]; char tmp[80];
ast_verbose(VERBOSE_PREFIX_2 "Registered translator '%s' from format %s to %s, cost %d\n", 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)), term_color(tmp, t->name, COLOR_MAGENTA, COLOR_BLACK, sizeof(tmp)),
ast_getformatname(1 << t->srcfmt), ast_getformatname(1 << t->dstfmt), t->cost); ast_getformatname(1 << t->srcfmt), ast_getformatname(1 << t->dstfmt), t->cost);
} }
AST_LIST_LOCK(&translators);
if (!added_cli) { if (!added_cli) {
ast_cli_register_multiple(cli_translate, sizeof(cli_translate) / sizeof(struct ast_cli_entry)); ast_cli_register_multiple(cli_translate, sizeof(cli_translate) / sizeof(struct ast_cli_entry));
added_cli++; added_cli++;
} }
AST_LIST_LOCK(&translators);
/* find any existing translators that provide this same srcfmt/dstfmt, /* find any existing translators that provide this same srcfmt/dstfmt,
and put this one in order based on cost */ and put this one in order based on cost */
AST_LIST_TRAVERSE_SAFE_BEGIN(&translators, u, list) { AST_LIST_TRAVERSE_SAFE_BEGIN(&translators, u, list) {
@@ -727,9 +720,7 @@ int __ast_register_translator(struct ast_translator *t, struct ast_module *mod)
AST_LIST_INSERT_HEAD(&translators, t, list); AST_LIST_INSERT_HEAD(&translators, t, list);
rebuild_matrix(0); rebuild_matrix(0);
AST_LIST_UNLOCK(&translators); AST_LIST_UNLOCK(&translators);
return 0; return 0;
} }