dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

correct array index calculation (thanks mtaht3!) 

update header file comments to reflect new usage of structure field


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@21207 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
kpfleming 2006-04-18 21:39:20 +00:00
parent 184bfd1c04
commit fd7889f0d9
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/asterisk/translate.h
View File

@ -65,8 +65,10 @@ struct ast_trans_pvt; /* declared below */
*/
struct ast_translator {
const char name[80]; /*! Name of translator */
int srcfmt; /*! Source format (note: bit position) */
int dstfmt; /*! Destination format (note: bit position) */
int srcfmt; /*! Source format (note: bit position,
converted to index during registration) */
int dstfmt; /*! Destination format (note: bit position,
converted to index during registration) */
/*! initialize private data associated with the translator */
void *(*newpvt)(struct ast_trans_pvt *);

5
translate.c
View File

@ -400,6 +400,7 @@ static void rebuild_matrix(int samples)
ast_log(LOG_DEBUG, "Resetting translation matrix\n");
bzero(tr_matrix, sizeof(tr_matrix));
/* first, compute all direct costs */
AST_LIST_TRAVERSE(&translators, t, list) {
x = t->srcfmt;
@ -413,6 +414,7 @@ static void rebuild_matrix(int samples)
tr_matrix[x][z].cost = t->cost;
}
}
/*
* For each triple x, y, z of distinct formats, check if there is
* a path from x to z through y which is cheaper than what is
@ -656,6 +658,9 @@ int ast_translator_best_choice(int *dst, int *srcs)
unsigned int ast_translate_path_steps(unsigned int dest, unsigned int src)
{
/* convert bitwise format numbers into array indices */
src = powerof(src);
dest = powerof(dest);
if (!tr_matrix[src][dest].step)
return -1;
else