sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a bug in the CLI reverbification, as pointed out by ZX81 in #asterisk-dev 

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43361 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jason Parker 2006-09-20 20:18:25 +00:00
parent 9ae105df1d
commit aefb5c269a
1 changed files with 69 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
res/res_convert.c
View File

@ -54,7 +54,7 @@ static int split_ext(char *filename, char **name, char **ext)
}
/*! \brief Convert a file from one format to another */
static int cli_audio_convert(int fd, int argc, char *argv[])
static int cli_audio_convert_deprecated(int fd, int argc, char *argv[])
{
int ret = RESULT_FAILURE;
struct ast_filestream *fs_in = NULL, *fs_out = NULL;
@ -121,6 +121,73 @@ fail_out:
return ret;
}
static int cli_audio_convert(int fd, int argc, char *argv[])
{
int ret = RESULT_FAILURE;
struct ast_filestream *fs_in = NULL, *fs_out = NULL;
struct ast_frame *f;
struct timeval start;
int cost;
char *file_in = NULL, *file_out = NULL;
char *name_in, *ext_in, *name_out, *ext_out;
/* ugly, can be removed when CLI entries have ast_module pointers */
ast_module_ref(ast_module_info->self);
if (argc != 4 || ast_strlen_zero(argv[2]) || ast_strlen_zero(argv[3])) {
ret = RESULT_SHOWUSAGE;
goto fail_out;
}
file_in = ast_strdupa(argv[2]);
file_out = ast_strdupa(argv[3]);
if (split_ext(file_in, &name_in, &ext_in)) {
ast_cli(fd, "'%s' is an invalid filename!\n", argv[2]);
goto fail_out;
}
if (!(fs_in = ast_readfile(name_in, ext_in, NULL, O_RDONLY, 0, 0))) {
ast_cli(fd, "Unable to open input file: %s\n", argv[2]);
goto fail_out;
}
if (split_ext(file_out, &name_out, &ext_out)) {
ast_cli(fd, "'%s' is an invalid filename!\n", argv[3]);
goto fail_out;
}
if (!(fs_out = ast_writefile(name_out, ext_out, NULL, O_CREAT|O_TRUNC|O_WRONLY, 0, 0644))) {
ast_cli(fd, "Unable to open output file: %s\n", argv[3]);
goto fail_out;
}
start = ast_tvnow();
while ((f = ast_readframe(fs_in))) {
if (ast_writestream(fs_out, f)) {
ast_cli(fd, "Failed to convert %s.%s to %s.%s!\n", name_in, ext_in, name_out, ext_out);
goto fail_out;
}
}
cost = ast_tvdiff_ms(ast_tvnow(), start);
ast_cli(fd, "Converted %s.%s to %s.%s in %dms\n", name_in, ext_in, name_out, ext_out, cost);
ret = RESULT_SUCCESS;
fail_out:
if (fs_out) {
ast_closestream(fs_out);
if (ret != RESULT_SUCCESS)
ast_filedelete(name_out, ext_out);
}
if (fs_in)
ast_closestream(fs_in);
ast_module_unref(ast_module_info->self);
return ret;
}
static char usage_audio_convert[] =
"Usage: file convert <file_in> <file_out>\n"
" Convert from file_in to file_out. If an absolute path is not given, the\n"
@ -130,7 +197,7 @@ static char usage_audio_convert[] =
static struct ast_cli_entry cli_convert_deprecated = {
{ "convert" , NULL },
cli_audio_convert, NULL,
cli_audio_convert_deprecated, NULL,
NULL };
static struct ast_cli_entry cli_convert[] = {