[asterisk-commits] trunk r19814 - /trunk/formats/format_wav_gsm.c

[asterisk-commits at lists.digium.com]

Author: tilghman
Date: Thu Apr 13 12:46:06 2006
New Revision: 19814

URL: http://svn.digium.com/view/asterisk?rev=19814&view=rev
Log:
Bug 6896 - Fix for garbled wav49 format

Modified:
    trunk/formats/format_wav_gsm.c

Modified: trunk/formats/format_wav_gsm.c
URL: http://svn.digium.com/view/asterisk/trunk/formats/format_wav_gsm.c?rev=19814&r1=19813&r2=19814&view=diff
==============================================================================
--- trunk/formats/format_wav_gsm.c (original)
+++ trunk/formats/format_wav_gsm.c Thu Apr 13 12:46:06 2006
@@ -226,7 +226,7 @@
 	end = ftello(f);
 	/* in a gsm WAV, data starts 60 bytes in */
 	bytes = end - MSGSM_DATA_OFFSET;
-	samples = bytes / GSM_FRAME_SIZE * MSGSM_SAMPLES;
+	samples = bytes / MSGSM_FRAME_SIZE * MSGSM_SAMPLES;
 	datalen = htoll((bytes + 1) & ~0x1);
 	filelen = htoll(MSGSM_DATA_OFFSET - 8 + ((bytes + 1) & ~0x1));
 	if (cur < 0) {
@@ -482,7 +482,7 @@
 		} else {	/* raw msgsm data */
 			src = f->data + len;
 		}
-		if (src && (res = fwrite(src, 1, size, s->f)) != size) {
+		if (src && (res = fwrite(src, 1, MSGSM_FRAME_SIZE, s->f)) != MSGSM_FRAME_SIZE) {
 			ast_log(LOG_WARNING, "Bad write (%d/65): %s\n", res, strerror(errno));
 			return -1;
 		}