dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

Merged revisions 94828-94829 via svnmerge from 

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r94828 | russell | 2007-12-27 08:33:21 -0600 (Thu, 27 Dec 2007) | 9 lines

Change ast_translator_best_choice() to only pay attention to audio formats.
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.

........
r94829 | russell | 2007-12-27 08:44:29 -0600 (Thu, 27 Dec 2007) | 2 lines

Use the constant that I really meant to use here ...

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@94830 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
russell 2007-12-27 14:52:07 +00:00
parent 086b05e131
commit 36f2ec39bc
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/asterisk/translate.h
View File

@ -24,7 +24,7 @@
#ifndef _ASTERISK_TRANSLATE_H
#define _ASTERISK_TRANSLATE_H
//#define MAX_FORMAT 15 /* Do not include video here */
#define MAX_AUDIO_FORMAT 15 /* Do not include video here */
#define MAX_FORMAT 32 /* Do include video here */
#if defined(__cplusplus) || defined(c_plusplus)

8
main/translate.c
View File

@ -717,10 +717,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 <= MAX_AUDIO_FORMAT; cur <<= 1, y++) {
if (cur & common) /* guaranteed to find one */
break;
}
@ -729,10 +729,10 @@ int ast_translator_best_choice(int *dst, int *srcs)
return 0;
} else { /* No, we will need to translate */
AST_RWLIST_RDLOCK(&translators);
for (cur = 1, y = 0; y < MAX_FORMAT; cur <<= 1, y++) {
for (cur = 1, y = 0; y <= MAX_AUDIO_FORMAT; cur <<= 1, y++) {
if (! (cur & *dst))
continue;
for (cursrc = 1, x = 0; x < MAX_FORMAT; cursrc <<= 1, x++) {
for (cursrc = 1, x = 0; x <= MAX_AUDIO_FORMAT; cursrc <<= 1, x++) {
if (!(*srcs & cursrc) || !tr_matrix[x][y].step ||
tr_matrix[x][y].cost > besttime)
continue; /* not existing or no better */