diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-04-03 07:49:05 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-04-03 07:49:05 +0000 |
commit | 8f48eef808be055a22ed8b378c0e337a15b1f041 (patch) | |
tree | b0fefba24c2a34bdde2fdd9b0d52a113371a25ed | |
parent | 5fc7941629716375b509232d64fa0cdf6aa026ef (diff) |
Use a 32k file buffer on recordings, which increases the efficiency of file recording.
(closes issue #11962)
Reported by: garlew
Patches:
recording.patch uploaded by garlew (license 376)
bug-11962.diff uploaded by snuffy (license 35)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@112564 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | formats/format_wav.c | 6 | ||||
-rw-r--r-- | include/asterisk/mod_format.h | 1 | ||||
-rw-r--r-- | main/file.c | 14 |
3 files changed, 18 insertions, 3 deletions
diff --git a/formats/format_wav.c b/formats/format_wav.c index 2a40dedbd..bbeb20baf 100644 --- a/formats/format_wav.c +++ b/formats/format_wav.c @@ -328,6 +328,11 @@ static void wav_close(struct ast_filestream *s) { char zero = 0; struct wav_desc *fs = (struct wav_desc *)s->_private; + + if (s->filename) { + update_header(s->f); + } + /* Pad to even length */ if (fs->bytes & 0x1) fwrite(&zero, 1, 1, s->f); @@ -416,7 +421,6 @@ static int wav_write(struct ast_filestream *fs, struct ast_frame *f) } s->bytes += f->datalen; - update_header(fs->f); return 0; diff --git a/include/asterisk/mod_format.h b/include/asterisk/mod_format.h index c51bf681c..f415b2b6b 100644 --- a/include/asterisk/mod_format.h +++ b/include/asterisk/mod_format.h @@ -117,6 +117,7 @@ struct ast_filestream { char *buf; /*!< buffer pointed to by ast_frame; */ void *_private; /*!< pointer to private buffer */ const char *orig_chan_name; + char *write_buffer; }; /*! diff --git a/main/file.c b/main/file.c index 73387a2ff..e34020ed8 100644 --- a/main/file.c +++ b/main/file.c @@ -817,17 +817,22 @@ int ast_closestream(struct ast_filestream *f) ast_safe_system(cmd); } + if (f->fmt->close) { + f->fmt->close(f); + } if (f->filename) ast_free(f->filename); if (f->realfilename) ast_free(f->realfilename); - if (f->fmt->close) - f->fmt->close(f); fclose(f->f); if (f->vfs) ast_closestream(f->vfs); if (f->orig_chan_name) free((void *) f->orig_chan_name); + if (f->write_buffer) { + ast_free(f->write_buffer); + } + ast_module_unref(f->fmt->module); ast_free(f); return 0; @@ -1051,6 +1056,11 @@ struct ast_filestream *ast_writefile(const char *filename, const char *type, con } fs->vfs = NULL; /* If truncated, we'll be at the beginning; if not truncated, then append */ + + if ((fs->write_buffer = ast_malloc(32768))){ + setvbuf(fs->f, fs->write_buffer, _IOFBF, 32768); + } + f->seek(fs, 0, SEEK_END); } else if (errno != EEXIST) { ast_log(LOG_WARNING, "Unable to open file %s: %s\n", fn, strerror(errno)); |