kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-20 03:59:01 +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@60447 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge Script
2007-04-06 15:54:39 +00:00
parent bf5b3a7fca
commit 3dbf6e09a7
1 changed files with 4 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
codecs/codec_zap.c
View File

@@ -55,7 +55,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#define BUFFER_SAMPLES 8000 #define BUFFER_SAMPLES 8000
static unsigned int global_useplc = 0; static unsigned int global_useplc = 0;
static int cardsmode = 0;
static int totalchannels = 0; static int totalchannels = 0;
static int complexinuse = 0; static int complexinuse = 0;
@@ -109,17 +108,14 @@ struct ast_translator_pvt {
static int show_transcoder(int fd, int argc, char **argv) static int show_transcoder(int fd, int argc, char **argv)
{ {
ast_mutex_lock(&channelcount); ast_mutex_lock(&channelcount);
if (!totalchannels) { if (!totalchannels) {
ast_cli(fd, "No transcoder card registered\n"); ast_cli(fd, "No transcoder card registered\n");
ast_mutex_unlock(&channelcount); ast_mutex_unlock(&channelcount);
return RESULT_SUCCESS; return RESULT_SUCCESS;
} }
if(!cardsmode)
ast_cli(fd, "%d/%d encoders/decoders of %d channels (G.729a / G.723.1 5.3 kbps) are in use.\n",complexinuse, simpleinuse, totalchannels); ast_cli(fd, "%d/%d encoders/decoders of %d channels are in use.\n", complexinuse, simpleinuse, totalchannels);
else if (cardsmode == 1)
ast_cli(fd, "%d/%d encoders/decoders of %d channels (G.729a) are in use.\n",complexinuse, simpleinuse, totalchannels);
else if (cardsmode == 2)
ast_cli(fd, "%d/%d encoders/decoders of %d channels (G.723.1 5.3 kbps) are in use.\n",complexinuse, simpleinuse, totalchannels);
ast_mutex_unlock(&channelcount); ast_mutex_unlock(&channelcount);
return RESULT_SUCCESS; return RESULT_SUCCESS;
@@ -714,8 +710,7 @@ static int register_translator(int dst, int src)
ast_log(LOG_ERROR, "Could not allocate translator\n"); ast_log(LOG_ERROR, "Could not allocate translator\n");
return -1; return -1;
} }
if (!((cardsmode == 1 && (dst == 8 || src == 8)) || (cardsmode == 2 && (dst == 0 || src == 0)) || (cardsmode == 0)))
return -1;
snprintf((char *) (zt->t.name), sizeof(zt->t.name), "zap%sto%s", snprintf((char *) (zt->t.name), sizeof(zt->t.name), "zap%sto%s",
ast_getformatname((1 << src)), ast_getformatname((1 << dst))); ast_getformatname((1 << src)), ast_getformatname((1 << dst)));
@@ -794,7 +789,6 @@ static void parse_config(void)
{ {
struct ast_variable *var; struct ast_variable *var;
struct ast_config *cfg = ast_config_load("codecs.conf"); struct ast_config *cfg = ast_config_load("codecs.conf");
cardsmode = 0;
if (!cfg) if (!cfg)
return; return;
@@ -806,16 +800,6 @@ static void parse_config(void)
ast_verbose(VERBOSE_PREFIX_3 "codec_zap: %susing generic PLC\n", global_useplc ? "" : "not "); ast_verbose(VERBOSE_PREFIX_3 "codec_zap: %susing generic PLC\n", global_useplc ? "" : "not ");
} }
} }
for (var = ast_variable_browse(cfg, "transcoder_card"); var; var = var->next) {
if (!strcasecmp(var->name, "mode")) {
if(strstr(var->value, "g729"))
cardsmode = 1;
else if(strstr(var->value, "g723"))
cardsmode = 2;
else if(strstr(var->value, "mixed"))
cardsmode = 0;
}
}
ast_config_destroy(cfg); ast_config_destroy(cfg);
} }
@@ -891,7 +875,6 @@ static int find_transcoders(void)
int reload(void) int reload(void)
{ {
parse_config(); parse_config();
find_transcoders();
return 0; return 0;
} }