[Asterisk-cvs] asterisk/channels chan_phone.c, 1.48, 1.49 iax2-parser.c, 1.40, 1.41

kpfleming at lists.digium.com kpfleming at lists.digium.com
Sun Apr 3 21:20:44 CDT 2005


Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv29257/channels

Modified Files:
	chan_phone.c iax2-parser.c 
Log Message:
fix breakage from slin endianness commit earlier today (sorry :-()


Index: chan_phone.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_phone.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- chan_phone.c	3 Apr 2005 22:57:17 -0000	1.48
+++ chan_phone.c	4 Apr 2005 02:13:40 -0000	1.49
@@ -559,7 +559,7 @@
 	if (space < len)
 		len = space;
 	if (swap)
-		ast_memcpy_byteswap(p->obuf+p->obuflen, buf, len/2);
+		ast_swapcopy_samples(p->obuf+p->obuflen, buf, len/2);
 	else
 		memcpy(p->obuf + p->obuflen, buf, len);
 	p->obuflen += len;

Index: iax2-parser.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/iax2-parser.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- iax2-parser.c	3 Apr 2005 22:57:17 -0000	1.40
+++ iax2-parser.c	4 Apr 2005 02:13:40 -0000	1.41
@@ -859,7 +859,7 @@
 #if __BYTE_ORDER == __LITTLE_ENDIAN
 		/* We need to byte-swap slinear samples from network byte order */
 		if (fr->af.subclass == AST_FORMAT_SLINEAR) {
-			ast_memcpy_byteswap(fr->af.data, f->data, fr->af.samples);
+			ast_swapcopy_samples(fr->af.data, f->data, fr->af.samples);
 		} else
 #endif
 		memcpy(fr->af.data, f->data, fr->af.datalen);




More information about the svn-commits mailing list