diff options
author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-06-03 17:21:06 +0000 |
---|---|---|
committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-06-03 17:21:06 +0000 |
commit | f8e42423ba838f74caab37dc1e0a103542121193 (patch) | |
tree | 31aedf32e9a5f0b693d961b1dcf7733b1e15a799 /codecs/codec_g722.c | |
parent | ff37f9e1a548b24c0a83d309352fa56554867435 (diff) |
Merged revisions 267492 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r267492 | mmichelson | 2010-06-03 12:09:11 -0500 (Thu, 03 Jun 2010) | 6 lines
Remove unnecessary code relating to PLC.
The logic for handling generic PLC is now handled in ast_write in
channel.c instead of in translation code.
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@267507 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'codecs/codec_g722.c')
-rw-r--r-- | codecs/codec_g722.c | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/codecs/codec_g722.c b/codecs/codec_g722.c index bdd175e57..22196da01 100644 --- a/codecs/codec_g722.c +++ b/codecs/codec_g722.c @@ -142,7 +142,6 @@ static struct ast_translator g722tolin = { .desc_size = sizeof(struct g722_decoder_pvt), .buffer_samples = BUFFER_SAMPLES / sizeof(int16_t), .buf_size = BUFFER_SAMPLES, - .plc_samples = 160, }; static struct ast_translator lintog722 = { @@ -167,7 +166,6 @@ static struct ast_translator g722tolin16 = { .desc_size = sizeof(struct g722_decoder_pvt), .buffer_samples = BUFFER_SAMPLES / sizeof(int16_t), .buf_size = BUFFER_SAMPLES, - .plc_samples = 160, }; static struct ast_translator lin16tog722 = { @@ -182,29 +180,8 @@ static struct ast_translator lin16tog722 = { .buf_size = BUFFER_SAMPLES, }; -static int parse_config(int reload) -{ - struct ast_variable *var; - struct ast_flags config_flags = { reload ? CONFIG_FLAG_FILEUNCHANGED : 0 }; - struct ast_config *cfg = ast_config_load("codecs.conf", config_flags); - - if (cfg == CONFIG_STATUS_FILEMISSING || cfg == CONFIG_STATUS_FILEUNCHANGED || cfg == CONFIG_STATUS_FILEINVALID) - return 0; - for (var = ast_variable_browse(cfg, "plc"); var; var = var->next) { - if (!strcasecmp(var->name, "genericplc")) { - g722tolin.useplc = ast_true(var->value) ? 1 : 0; - ast_verb(3, "codec_g722: %susing generic PLC\n", - g722tolin.useplc ? "" : "not "); - } - } - ast_config_destroy(cfg); - return 0; -} - static int reload(void) { - if (parse_config(1)) - return AST_MODULE_LOAD_DECLINE; return AST_MODULE_LOAD_SUCCESS; } @@ -224,9 +201,6 @@ static int load_module(void) { int res = 0; - if (parse_config(0)) - return AST_MODULE_LOAD_DECLINE; - res |= ast_register_translator(&g722tolin); res |= ast_register_translator(&lintog722); res |= ast_register_translator(&g722tolin16); |