kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-13 00:04:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "app_record: Add option to prevent silence from being truncated" into 13

Browse Source
This commit is contained in:
zuul
2017-02-14 14:56:00 -06:00
committed by Gerrit Code Review
parent 0d6c99e715 f99e5f4de4
commit 500b02cb82
2 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
CHANGES
View File

@@ -8,6 +8,15 @@
===
==============================================================================
------------------------------------------------------------------------------
--- Functionality changes from Asterisk 13.14.0 to Asterisk 13.15.0 ----------
------------------------------------------------------------------------------
app_record
------------------
* Added new 'u' option to Record() application which prevents Asterisk from
truncating silence from the end of recorded files.
------------------------------------------------------------------------------
--- Functionality changes from Asterisk 13.13.0 to Asterisk 13.14.0 ----------
------------------------------------------------------------------------------

13
apps/app_record.c
View File

@@ -81,6 +81,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
<option name="t">
<para>use alternate '*' terminator key (DTMF) instead of default '#'</para>
</option>
<option name="u">
<para>Don't truncate recorded silence.</para>
</option>
<option name="x">
<para>Ignore all terminator keys (DTMF) and keep recording until hangup.</para>
</option>
@@ -133,6 +136,7 @@ enum {
FLAG_HAS_PERCENT = (1 << 7),
OPTION_ANY_TERMINATE = (1 << 8),
OPTION_OPERATOR_EXIT = (1 << 9),
OPTION_NO_TRUNCATE = (1 << 10),
};
AST_APP_OPTIONS(app_opts,{
@@ -143,6 +147,7 @@ AST_APP_OPTIONS(app_opts,{
AST_APP_OPTION('q', OPTION_QUIET),
AST_APP_OPTION('s', OPTION_SKIP),
AST_APP_OPTION('t', OPTION_STAR_TERMINATE),
AST_APP_OPTION('u', OPTION_NO_TRUNCATE),
AST_APP_OPTION('y', OPTION_ANY_TERMINATE),
AST_APP_OPTION('x', OPTION_IGNORE_TERMINATE),
});
@@ -194,6 +199,7 @@ static int record_exec(struct ast_channel *chan, const char *data)
int dspsilence = 0;
int silence = 0; /* amount of silence to allow */
int gotsilence = 0; /* did we timeout for silence? */
int truncate_silence = 1; /* truncate on complete silence recording */
int maxduration = 0; /* max duration of recording in milliseconds */
int gottimeout = 0; /* did we timeout for maxduration exceeded? */
int terminator = '#';
@@ -245,7 +251,10 @@ static int record_exec(struct ast_channel *chan, const char *data)
ast_log(LOG_WARNING, "'%s' is not a valid silence duration\n", args.silence);
}
}
if (ast_test_flag(&flags, OPTION_NO_TRUNCATE))
truncate_silence = 0;
if (args.maxduration) {
if ((sscanf(args.maxduration, "%30d", &i) == 1) && (i > -1))
/* Convert duration to milliseconds */
@@ -445,7 +454,7 @@ static int record_exec(struct ast_channel *chan, const char *data)
}
}
if (gotsilence) {
if (gotsilence && truncate_silence) {
ast_stream_rewind(s, silence - 1000);
ast_truncstream(s);
} else if (!gottimeout && f) {