diff options
| author | Jenkins2 <jenkins2@gerrit.asterisk.org> | 2017-11-30 10:16:17 -0600 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-11-30 10:16:17 -0600 |
| commit | 5de9754313ee30080c591fab7f0aef74a65f2417 (patch) | |
| tree | f062f1010dd48ee6fcb0553396530f97a3033856 /main/translate.c | |
| parent | 85d83dd0ca42032f8d7c23d356fc9de8825a8b5c (diff) | |
| parent | 58115e9c213fe71729abfd86c5ba97bc575146d3 (diff) | |
Merge "translate: Transcode siren14, speex32, silk24, and silk12 via slin16."
Diffstat (limited to 'main/translate.c')
| -rw-r--r-- | main/translate.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/main/translate.c b/main/translate.c index 30f16492e..70e97f955 100644 --- a/main/translate.c +++ b/main/translate.c @@ -32,6 +32,7 @@ #include <sys/time.h> #include <sys/resource.h> #include <math.h> +#include <stdlib.h> #include "asterisk/lock.h" #include "asterisk/channel.h" @@ -1413,6 +1414,20 @@ int ast_translator_best_choice(struct ast_format_cap *dst_cap, ao2_replace(bestdst, dst); besttablecost = matrix_get(x, y)->table_cost; beststeps = matrix_get(x, y)->multistep; + } else if (matrix_get(x, y)->table_cost == besttablecost + && matrix_get(x, y)->multistep == beststeps) { + int gap_selected = abs(ast_format_get_sample_rate(best) + - ast_format_get_sample_rate(bestdst)); + int gap_current = abs(ast_format_get_sample_rate(src) + - ast_format_get_sample_rate(dst)); + + if (gap_current < gap_selected) { + /* better than what we have so far */ + ao2_replace(best, src); + ao2_replace(bestdst, dst); + besttablecost = matrix_get(x, y)->table_cost; + beststeps = matrix_get(x, y)->multistep; + } } } } |