app_record: Add option to prevent silence from being truncated

When using Record() with the silence detection feature, the stream is
written out to the given file. However, if only 'silence' is detected,
this file is then truncated to the first second of the recording.

This patch adds the 'u' option to Record() to override that behavior.

ASTERISK-18286 #close
Reported by: var
Patches:
	app_record-1.8.7.1.diff (license #6184) patch uploaded by var

Change-Id: Ia1cd163483235efe2db05e52f39054288553b957

diff --git a/CHANGES b/CHANGES
index dc5f0584c4de5c2324c0cd24a373087094bfc896..d148f6bf6989577667d4e089bee035470961f210 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -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 ----------
 ------------------------------------------------------------------------------

diff --git a/apps/app_record.c b/apps/app_record.c
index 31a54e663bc2e140e7e4ea942849dbf79a9d58e6..56dc5f47f3d234d6d47e56405575a5423e013cf6 100644 (file)
--- a/apps/app_record.c
+++ b/apps/app_record.c
@@ -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) {