diff options
| -rw-r--r-- | include/asterisk/translate.h | 1 | ||||
| -rw-r--r-- | main/translate.c | 87 |
2 files changed, 49 insertions, 39 deletions
diff --git a/include/asterisk/translate.h b/include/asterisk/translate.h index a03f54ef2..8f85e18d4 100644 --- a/include/asterisk/translate.h +++ b/include/asterisk/translate.h @@ -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 seen; /*!< If we have seen this translator before (optimize re-registration) */ AST_LIST_ENTRY(ast_translator) list; /*!< link field */ }; diff --git a/main/translate.c b/main/translate.c index c7172619b..3843b99ae 100644 --- a/main/translate.c +++ b/main/translate.c @@ -650,58 +650,65 @@ int __ast_register_translator(struct ast_translator *t, struct ast_module *mod) return -1; } - if (!t->buf_size) { - ast_log(LOG_WARNING, "empty buf size, you need to supply one\n"); - return -1; - } + if (!t->seen) { + if (!t->buf_size) { + ast_log(LOG_WARNING, "empty buf size, you need to supply one\n"); + return -1; + } - t->module = mod; - if (t->plc_samples) { - if (t->buffer_samples < t->plc_samples) { - ast_log(LOG_WARNING, "plc_samples %d buffer_samples %d\n", - t->plc_samples, t->buffer_samples); + t->module = mod; + if (t->plc_samples) { + if (t->buffer_samples < t->plc_samples) { + ast_log(LOG_WARNING, "plc_samples %d buffer_samples %d\n", + t->plc_samples, t->buffer_samples); + return -1; + } + if (t->dstfmt != AST_FORMAT_SLINEAR) + 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 != AST_FORMAT_SLINEAR) - 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 - * alignment for pointers. - */ - 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; + 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 + * alignment for pointers. + */ + 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); + calc_cost(t, 1); + + t->seen = 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) { @@ -720,7 +727,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; } |