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

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

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@94829 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2007-12-27 14:44:29 +00:00
parent c792659cc7
commit 67df6e008d
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/asterisk/translate.h
View File

@@ -23,7 +23,7 @@
#ifndef _ASTERISK_TRANSLATE_H #ifndef _ASTERISK_TRANSLATE_H
#define _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 */ #define MAX_FORMAT 32 /* Do include video here */
#if defined(__cplusplus) || defined(c_plusplus) #if defined(__cplusplus) || defined(c_plusplus)

6
main/translate.c
View File

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