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

Voicemail: get correct duration when copying file to vm

Browse Source 
Changes made during format improvements resulted in the
recording to voicemail option 'm' of the MixMonitor app
writing a zero length duration in the msgXXXX.txt file.

This change introduces a new function ast_ratestream(),
which provides the sample rate of the format associated
with the stream, and updates the app_voicemail function
for ast_app_copy_recording_to_vm to calculate the right
duration.

Review: https://reviewboard.asterisk.org/r/3996/
ASTERISK-24328 #close



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@423192 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Scott Griepentrog
2014-09-16 16:32:49 +00:00
parent 48d58da883
commit 79b702f308
3 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
apps/app_voicemail.c
View File

@@ -6130,15 +6130,11 @@ static int msg_create_from_file(struct ast_vm_recording_data *recdata)
if ((recording_fs = ast_readfile(recdata->recording_file, recdata->recording_ext, NULL, 0, 0, VOICEMAIL_DIR_MODE))) {
if (!ast_seekstream(recording_fs, 0, SEEK_END)) {
long framelength = ast_tellstream(recording_fs);
struct ast_format *result;
/* XXX This use of ast_getformatbyname seems incorrect here. The file extension does not necessarily correspond
* to the name of the format. For instance, if "raw" were passed in, I don't think ast_getformatbyname would
* find the slinear format
*/
result = ast_format_cache_get(recdata->recording_ext);
if (result) {
duration = (int) (framelength / ast_format_get_sample_rate(result));
ao2_ref(result, -1);
int sample_rate = ast_ratestream(recording_fs);
if (sample_rate) {
duration = (int) (framelength / sample_rate);
} else {
ast_log(LOG_ERROR,"Unable to determine sample rate of recording %s\n", recdata->recording_file);
}
}
}

7
include/asterisk/file.h
View File

@@ -350,6 +350,13 @@ int ast_stream_rewind(struct ast_filestream *fs, off_t ms);
*/
off_t ast_tellstream(struct ast_filestream *fs);
/*!
* \brief Return the sample rate of the stream's format
* \param fs fs to act on
* \return sample rate in Hz
*/
int ast_ratestream(struct ast_filestream *fs);
/*!
* \brief Read a frame from a filestream
* \param s ast_filestream to act on

5
main/file.c
View File

@@ -1026,6 +1026,11 @@ off_t ast_tellstream(struct ast_filestream *fs)
return fs->fmt->tell(fs);
}
int ast_ratestream(struct ast_filestream *fs)
{
return ast_format_get_sample_rate(fs->fmt->format);
}
int ast_stream_fastforward(struct ast_filestream *fs, off_t ms)
{
return ast_seekstream(fs, ms * DEFAULT_SAMPLES_PER_MS, SEEK_CUR);