From 1e2baaf12e6b20a7b21ee8d16b6927373684cea2 Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Fri, 1 Apr 2005 03:23:33 +0000 Subject: [PATCH] fix wav fomat (bug #3837) git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/v1-0@5329 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- CHANGES | 5 +++-- formats/format_wav_gsm.c | 5 +---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/CHANGES b/CHANGES index 834ebdd31b..60cbe74cd3 100755 --- a/CHANGES +++ b/CHANGES @@ -14,10 +14,11 @@ -- res_agi -- A fix has been added to prevent calls from being hung up when more than one call is executing an AGI script calling the GET DATA command. - -- asterisk.spec - -- A line was missing for the autosupport script that caused "make rpm" to fail -- general -- A problem has been fixed with saying the date in Spanish. + -- A line was missing for the autosupport script that caused "make rpm" to fail + -- Fixed a problem with wav formatting that prevented files from being played + in some media players Asterisk 1.0.7 diff --git a/formats/format_wav_gsm.c b/formats/format_wav_gsm.c index 5b4d31f6a5..ad3e24fc85 100755 --- a/formats/format_wav_gsm.c +++ b/formats/format_wav_gsm.c @@ -51,7 +51,6 @@ struct ast_filestream { weird MS format */ /* This is what a filestream means to us */ int fd; /* Descriptor */ - int bytes; struct ast_frame fr; /* Frame information */ char waste[AST_FRIENDLY_OFFSET]; /* Buffer for sending frames, etc */ char empty; /* Empty character */ @@ -398,7 +397,7 @@ static void wav_close(struct ast_filestream *s) ast_mutex_unlock(&wav_lock); ast_update_use_count(); /* Pad to even length */ - if (s->bytes & 0x1) + if (lseek(s->fd, 0, SEEK_END) & 0x1) write(s->fd, &zero, 1); close(s->fd); free(s); @@ -458,7 +457,6 @@ static int wav_write(struct ast_filestream *fs, struct ast_frame *f) ast_log(LOG_WARNING, "Bad write (%d/65): %s\n", res, strerror(errno)); return -1; } - fs->bytes += 65; update_header(fs->fd); len += 65; } else { @@ -469,7 +467,6 @@ static int wav_write(struct ast_filestream *fs, struct ast_frame *f) ast_log(LOG_WARNING, "Bad write (%d/65): %s\n", res, strerror(errno)); return -1; } - fs->bytes += 65; update_header(fs->fd); } else { /* Copy the data and do nothing */