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

Merged revisions 89275 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r89275 | tilghman | 2007-11-14 17:23:58 -0600 (Wed, 14 Nov 2007) | 5 lines

When a recording ends with '#', we are improperly trimming an extra 200ms from the recording.
Reported by: sim
Patch by: tilghman
Closes issue #11247

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89276 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2007-11-15 00:01:22 +00:00
parent 5112f2b7e9
commit 8820ae5b2e
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
main/app.c
View File

@@ -767,8 +767,13 @@ static int __ast_play_and_record(struct ast_channel *chan, const char *playfile,
for (x = 0; x < fmtcnt; x++) {
if (!others[x])
break;
if (res > 0)
ast_stream_rewind(others[x], totalsilence ? totalsilence - 200 : 200);
/*!\note
* If we ended with silence, trim all but the first 200ms of silence
* off the recording. However, if we ended with '#', we don't want
* to trim ANY part of the recording.
*/
if (res > 0 && totalsilence)
ast_stream_rewind(others[x], totalsilence - 200);
ast_truncstream(others[x]);
ast_closestream(others[x]);
}
@@ -783,7 +788,9 @@ static int __ast_play_and_record(struct ast_channel *chan, const char *playfile,
realfiles[x] = ast_readfile(recordfile, sfmt[x], comment, O_RDONLY, 0, 0);
if (!others[x] || !realfiles[x])
break;
ast_stream_rewind(others[x], totalsilence ? totalsilence - 200 : 200);
/*!\note Same logic as above. */
if (totalsilence)
ast_stream_rewind(others[x], totalsilence - 200);
ast_truncstream(others[x]);
/* add the original file too */
while ((fr = ast_readframe(realfiles[x]))) {