kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 12:16:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 111658 via svnmerge from

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

........
r111658 | qwell | 2008-03-28 11:19:56 -0500 (Fri, 28 Mar 2008) | 8 lines

The file size of WAV49 does not need to be an even number.

(closes issue #12128)
Reported by: mdu113
Patches:
      12128-noevenlength.diff uploaded by qwell (license 4)
Tested by: qwell, mdu113

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@111659 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jason Parker
2008-03-28 16:20:59 +00:00
parent 3f78a375a0
commit 8b31f34e78
1 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
formats/format_wav_gsm.c
View File

@@ -214,8 +214,8 @@ static int update_header(FILE *f)
/* in a gsm WAV, data starts 60 bytes in */ /* in a gsm WAV, data starts 60 bytes in */
bytes = end - MSGSM_DATA_OFFSET; bytes = end - MSGSM_DATA_OFFSET;
samples = htoll(bytes / MSGSM_FRAME_SIZE * MSGSM_SAMPLES); samples = htoll(bytes / MSGSM_FRAME_SIZE * MSGSM_SAMPLES);
datalen = htoll((bytes + 1) & ~0x1); datalen = htoll(bytes);
filelen = htoll(MSGSM_DATA_OFFSET - 8 + ((bytes + 1) & ~0x1)); filelen = htoll(MSGSM_DATA_OFFSET - 8 + bytes);
if (cur < 0) { if (cur < 0) {
ast_log(LOG_WARNING, "Unable to find our position\n"); ast_log(LOG_WARNING, "Unable to find our position\n");
return -1; return -1;
@@ -389,15 +389,6 @@ static int wav_rewrite(struct ast_filestream *s, const char *comment)
return 0; return 0;
} }
static void wav_close(struct ast_filestream *s)
{
char zero = 0;
/* Pad to even length */
fseek(s->f, 0, SEEK_END);
if (ftello(s->f) & 0x1)
fwrite(&zero, 1, 1, s->f);
}
static struct ast_frame *wav_read(struct ast_filestream *s, int *whennext) static struct ast_frame *wav_read(struct ast_filestream *s, int *whennext)
{ {
/* Send a frame from the file to the appropriate channel */ /* Send a frame from the file to the appropriate channel */
@@ -539,7 +530,6 @@ static const struct ast_format wav49_f = {
.trunc = wav_trunc, .trunc = wav_trunc,
.tell = wav_tell, .tell = wav_tell,
.read = wav_read, .read = wav_read,
.close = wav_close,
.buf_size = 2*GSM_FRAME_SIZE + AST_FRIENDLY_OFFSET, .buf_size = 2*GSM_FRAME_SIZE + AST_FRIENDLY_OFFSET,
.desc_size = sizeof(struct wavg_desc), .desc_size = sizeof(struct wavg_desc),
}; };