kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

automerge commit

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@11115 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2006-02-25 06:04:09 +00:00
parent 2719e0aa02
commit b9b4ae4c34
1 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
translate.c
View File

@@ -454,14 +454,14 @@ int ast_translator_best_choice(int *dst, int *srcs)
int bestdst = 0;
int cur = 1;
int besttime = INT_MAX;
int beststeps = INT_MAX;
int common;
if ((common = (*dst) & (*srcs))) {
/* We have a format in common */
for (y=0; y < MAX_FORMAT; y++) {
for (y = 0; y < MAX_FORMAT; y++) {
if (cur & common) {
/* This is a common format to both. Pick it if we don't have one already */
besttime = 0;
bestdst = cur;
best = cur;
}
@@ -470,25 +470,38 @@ int ast_translator_best_choice(int *dst, int *srcs)
} else {
/* We will need to translate */
ast_mutex_lock(&list_lock);
for (y=0; y < MAX_FORMAT; y++) {
if (cur & *dst)
for (x=0; x < MAX_FORMAT; x++) {
if ((*srcs & (1 << x)) && /* x is a valid source format */
tr_matrix[x][y].step && /* There's a step */
(tr_matrix[x][y].cost < besttime)) { /* It's better than what we have so far */
best = 1 << x;
bestdst = cur;
besttime = tr_matrix[x][y].cost;
}
for (y = 0; y < MAX_FORMAT; y++) {
if (!(cur & *dst))
continue;
for (x = 0; x < MAX_FORMAT; x++) {
if ((*srcs & (1 << x)) && /* x is a valid source format */
tr_matrix[x][y].step) { /* There's a step */
if (tr_matrix[x][y].cost > besttime)
continue; /* It's more expensive, skip it */
if (tr_matrix[x][y].cost == besttime &&
tr_matrix[x][y].multistep >= beststeps)
continue; /* It requires the same (or more) steps,
skip it */
/* It's better than what we have so far */
best = 1 << x;
bestdst = cur;
besttime = tr_matrix[x][y].cost;
beststeps = tr_matrix[x][y].multistep;
}
}
cur = cur << 1;
}
ast_mutex_unlock(&list_lock);
}
if (best > -1) {
*srcs = best;
*dst = bestdst;
best = 0;
}
return best;
}