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

Change ast_translator_best_choice() to only pay attention to audio formats.

Browse Source 
This fixes a problem where Asterisk claims that a translation path can not be
found for channels involving video.

(closes issue #11638)
Reported by: cwhuang
Tested by: cwhuang
Patch suggested by cwhuang, with some additional changes by me.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@94828 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2007-12-27 14:33:21 +00:00
parent eb4d447b78
commit c792659cc7
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
main/translate.c
View File

@@ -796,10 +796,10 @@ int ast_translator_best_choice(int *dst, int *srcs)
int cur, cursrc;
int besttime = INT_MAX;
int beststeps = INT_MAX;
int common = (*dst) & (*srcs); /* are there common formats ? */
int common = ((*dst) & (*srcs)) & AST_FORMAT_AUDIO_MASK; /* are there common formats ? */
if (common) { /* yes, pick one and return */
for (cur = 1, y = 0; y < MAX_FORMAT; cur <<= 1, y++) {
for (cur = 1, y = 0; y <= AST_FORMAT_MAX_AUDIO; cur <<= 1, y++) {
if (cur & common) /* guaranteed to find one */
break;
}
@@ -808,10 +808,10 @@ int ast_translator_best_choice(int *dst, int *srcs)
return 0;
} else { /* No, we will need to translate */
AST_LIST_LOCK(&translators);
for (cur = 1, y = 0; y < MAX_FORMAT; cur <<= 1, y++) {
for (cur = 1, y = 0; y <= AST_FORMAT_MAX_AUDIO; cur <<= 1, y++) {
if (! (cur & *dst))
continue;
for (cursrc = 1, x = 0; x < MAX_FORMAT; cursrc <<= 1, x++) {
for (cursrc = 1, x = 0; x <= AST_FORMAT_MAX_AUDIO; cursrc <<= 1, x++) {
if (!(*srcs & cursrc) || !tr_matrix[x][y].step ||
tr_matrix[x][y].cost > besttime)
continue; /* not existing or no better */