[asterisk-commits] qwell: branch 1.6.0 r111660 - in /branches/1.6.0: ./ formats/format_wav_gsm.c

[SVN commits to the Asterisk project]

Author: qwell
Date: Fri Mar 28 11:21:31 2008
New Revision: 111660

URL: http://svn.digium.com/view/asterisk?view=rev&rev=111660
Log:
Merged revisions 111659 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r111659 | qwell | 2008-03-28 11:20:59 -0500 (Fri, 28 Mar 2008) | 16 lines

Merged revisions 111658 via svnmerge from 
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

........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/formats/format_wav_gsm.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/formats/format_wav_gsm.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/formats/format_wav_gsm.c?view=diff&rev=111660&r1=111659&r2=111660
==============================================================================
--- branches/1.6.0/formats/format_wav_gsm.c (original)
+++ branches/1.6.0/formats/format_wav_gsm.c Fri Mar 28 11:21:31 2008
@@ -214,8 +214,8 @@
 	/* in a gsm WAV, data starts 60 bytes in */
 	bytes = end - MSGSM_DATA_OFFSET;
 	samples = htoll(bytes / MSGSM_FRAME_SIZE * MSGSM_SAMPLES);
-	datalen = htoll((bytes + 1) & ~0x1);
-	filelen = htoll(MSGSM_DATA_OFFSET - 8 + ((bytes + 1) & ~0x1));
+	datalen = htoll(bytes);
+	filelen = htoll(MSGSM_DATA_OFFSET - 8 + bytes);
 	if (cur < 0) {
 		ast_log(LOG_WARNING, "Unable to find our position\n");
 		return -1;
@@ -387,15 +387,6 @@
 	if (write_header(s->f))
 		return -1;
 	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)
@@ -539,7 +530,6 @@
 	.trunc = wav_trunc,
 	.tell = wav_tell,
 	.read = wav_read,
-	.close = wav_close,
 	.buf_size = 2*GSM_FRAME_SIZE + AST_FRIENDLY_OFFSET,
 	.desc_size = sizeof(struct wavg_desc),
 };