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

Fix silence detection in app_record (bug #2883)

Browse source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4269 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer 2004-11-17 03:34:56 +00:00
parent 387fbae462
commit d1f802d254
1 changed files with 38 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
apps/app_record.c
View file

@ -114,12 +114,12 @@ static int record_exec(struct ast_channel *chan, void *data)
ast_log(LOG_WARNING, "No extension specified to filename!\n"); ast_log(LOG_WARNING, "No extension specified to filename!\n");
return -1; return -1;
} }
if (silstr) { if (silstr) {
if ((sscanf(silstr, "%d", &i) == 1) && (i > -1)) if ((sscanf(silstr, "%d", &i) == 1) && (i > -1)) {
silence = i; silence = i * 1000;
else if (!ast_strlen_zero(silstr)) } else if (!ast_strlen_zero(silstr)) {
ast_log(LOG_WARNING, "'%s' is not a valid silence duration\n", silstr); ast_log(LOG_WARNING, "'%s' is not a valid silence duration\n", silstr);
}
} }
if (maxstr) { if (maxstr) {
@ -185,19 +185,18 @@ static int record_exec(struct ast_channel *chan, void *data)
/* The end of beep code. Now the recording starts */ /* The end of beep code. Now the recording starts */
if (silence > 0) { if (silence > 0) {
rfmt = chan->readformat; rfmt = chan->readformat;
res = ast_set_read_format(chan, AST_FORMAT_SLINEAR); res = ast_set_read_format(chan, AST_FORMAT_SLINEAR);
if (res < 0) { if (res < 0) {
ast_log(LOG_WARNING, "Unable to set to linear mode, giving up\n"); ast_log(LOG_WARNING, "Unable to set to linear mode, giving up\n");
return -1; return -1;
} }
sildet = ast_dsp_new(); sildet = ast_dsp_new();
if (!sildet) { if (!sildet) {
ast_log(LOG_WARNING, "Unable to create silence detector :(\n"); ast_log(LOG_WARNING, "Unable to create silence detector :(\n");
return -1; return -1;
} }
ast_dsp_set_threshold(sildet, 256); ast_dsp_set_threshold(sildet, 256);
} }
@ -237,12 +236,12 @@ static int record_exec(struct ast_channel *chan, void *data)
} else { } else {
totalsilence = 0; totalsilence = 0;
} }
if (totalsilence > silence) { if (totalsilence > silence) {
/* Ended happily with silence */ /* Ended happily with silence */
ast_frfree(f); ast_frfree(f);
gotsilence = 1; gotsilence = 1;
break; break;
} }
} }
} }
if (f->frametype == AST_FRAME_VIDEO) { if (f->frametype == AST_FRAME_VIDEO) {
@ -261,8 +260,8 @@ static int record_exec(struct ast_channel *chan, void *data)
ast_frfree(f); ast_frfree(f);
} }
if (!f) { if (!f) {
ast_log(LOG_DEBUG, "Got hangup\n"); ast_log(LOG_DEBUG, "Got hangup\n");
res = -1; res = -1;
} }
if (gotsilence) { if (gotsilence) {
@ -281,9 +280,9 @@ static int record_exec(struct ast_channel *chan, void *data)
LOCAL_USER_REMOVE(u); LOCAL_USER_REMOVE(u);
if ((silence > 0) && rfmt) { if ((silence > 0) && rfmt) {
res = ast_set_read_format(chan, rfmt); res = ast_set_read_format(chan, rfmt);
if (res) if (res)
ast_log(LOG_WARNING, "Unable to restore read format on '%s'\n", chan->name); ast_log(LOG_WARNING, "Unable to restore read format on '%s'\n", chan->name);
if (sildet) if (sildet)
ast_dsp_free(sildet); ast_dsp_free(sildet);
} }