[Asterisk-cvs] asterisk/formats format_g726.c, 1.7,
1.8 format_g729.c, 1.16, 1.17 format_gsm.c, 1.21,
1.22 format_h263.c, 1.8, 1.9 format_ilbc.c, 1.9,
1.10 format_jpeg.c, 1.7, 1.8 format_pcm.c, 1.17,
1.18 format_pcm_alaw.c, 1.15, 1.16 format_sln.c, 1.4,
1.5 format_vox.c, 1.18, 1.19 format_wav.c, 1.21,
1.22 format_wav_gsm.c, 1.30, 1.31
markster at lists.digium.com
markster at lists.digium.com
Mon Mar 28 22:55:39 CST 2005
Update of /usr/cvsroot/asterisk/formats
In directory mongoose.digium.com:/tmp/cvs-serv6904/formats
Modified Files:
format_g726.c format_g729.c format_gsm.c format_h263.c
format_ilbc.c format_jpeg.c format_pcm.c format_pcm_alaw.c
format_sln.c format_vox.c format_wav.c format_wav_gsm.c
Log Message:
Simplify endianness and fix for unaligned reads (bug #3867)
Index: format_g726.c
===================================================================
RCS file: /usr/cvsroot/asterisk/formats/format_g726.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- format_g726.c 21 Jan 2005 07:06:25 -0000 1.7
+++ format_g726.c 29 Mar 2005 04:49:24 -0000 1.8
@@ -16,6 +16,7 @@
#include <asterisk/logger.h>
#include <asterisk/sched.h>
#include <asterisk/module.h>
+#include <asterisk/endian.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <stdlib.h>
@@ -24,15 +25,6 @@
#include <unistd.h>
#include <errno.h>
#include <string.h>
-#ifdef __linux__
-#include <endian.h>
-#else
-#ifdef SOLARIS
-#include "solaris-compat/compat.h"
-#else
-#include <machine/endian.h>
-#endif
-#endif
#define RATE_40 0
#define RATE_32 1
Index: format_g729.c
===================================================================
RCS file: /usr/cvsroot/asterisk/formats/format_g729.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- format_g729.c 4 Feb 2005 15:46:01 -0000 1.16
+++ format_g729.c 29 Mar 2005 04:49:24 -0000 1.17
@@ -17,6 +17,7 @@
#include <asterisk/logger.h>
#include <asterisk/sched.h>
#include <asterisk/module.h>
+#include <asterisk/endian.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <stdlib.h>
@@ -25,15 +26,6 @@
#include <unistd.h>
#include <errno.h>
#include <string.h>
-#ifdef __linux__
-#include <endian.h>
-#else
-#ifdef SOLARIS
-#include "solaris-compat/compat.h"
-#else
-#include <machine/endian.h>
-#endif
-#endif
/* Some Ideas for this code came from makeg729e.c by Jeffrey Chilton */
Index: format_gsm.c
===================================================================
RCS file: /usr/cvsroot/asterisk/formats/format_gsm.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- format_gsm.c 21 Jan 2005 07:06:25 -0000 1.21
+++ format_gsm.c 29 Mar 2005 04:49:24 -0000 1.22
@@ -17,6 +17,7 @@
#include <asterisk/logger.h>
#include <asterisk/sched.h>
#include <asterisk/module.h>
+#include <asterisk/endian.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <stdlib.h>
@@ -25,15 +26,6 @@
#include <unistd.h>
#include <errno.h>
#include <string.h>
-#ifdef __linux__
-#include <endian.h>
-#else
-#ifdef SOLARIS
-#include "solaris-compat/compat.h"
-#else
-#include <machine/endian.h>
-#endif
-#endif
#include "msgsm.h"
/* Some Ideas for this code came from makegsme.c by Jeffrey Chilton */
Index: format_h263.c
===================================================================
RCS file: /usr/cvsroot/asterisk/formats/format_h263.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- format_h263.c 14 Dec 2004 23:36:30 -0000 1.8
+++ format_h263.c 29 Mar 2005 04:49:24 -0000 1.9
@@ -17,6 +17,7 @@
#include <asterisk/logger.h>
#include <asterisk/sched.h>
#include <asterisk/module.h>
+#include <asterisk/endian.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <stdlib.h>
@@ -25,15 +26,6 @@
#include <unistd.h>
#include <errno.h>
#include <string.h>
-#ifdef __linux__
-#include <endian.h>
-#else
-#ifdef SOLARIS
-#include "solaris-compat/compat.h"
-#else
-#include <machine/endian.h>
-#endif
-#endif
/* Some Ideas for this code came from makeh263e.c by Jeffrey Chilton */
Index: format_ilbc.c
===================================================================
RCS file: /usr/cvsroot/asterisk/formats/format_ilbc.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- format_ilbc.c 21 Jan 2005 07:06:25 -0000 1.9
+++ format_ilbc.c 29 Mar 2005 04:49:24 -0000 1.10
@@ -19,6 +19,7 @@
#include <asterisk/logger.h>
#include <asterisk/sched.h>
#include <asterisk/module.h>
+#include <asterisk/endian.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <stdlib.h>
@@ -27,15 +28,6 @@
#include <unistd.h>
#include <errno.h>
#include <string.h>
-#ifdef __linux__
-#include <endian.h>
-#else
-#ifdef SOLARIS
-#include "solaris-compat/compat.h"
-#else
-#include <machine/endian.h>
-#endif
-#endif
/* Some Ideas for this code came from makeg729e.c by Jeffrey Chilton */
Index: format_jpeg.c
===================================================================
RCS file: /usr/cvsroot/asterisk/formats/format_jpeg.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- format_jpeg.c 14 Dec 2004 23:36:30 -0000 1.7
+++ format_jpeg.c 29 Mar 2005 04:49:24 -0000 1.8
@@ -19,6 +19,7 @@
#include <asterisk/module.h>
#include <asterisk/image.h>
#include <asterisk/lock.h>
+#include <asterisk/endian.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <stdlib.h>
@@ -27,15 +28,6 @@
#include <unistd.h>
#include <errno.h>
#include <string.h>
-#ifdef __linux__
-#include <endian.h>
-#else
-#ifdef SOLARIS
-#include "solaris-compat/compat.h"
-#else
-#include <machine/endian.h>
-#endif
-#endif
static char *desc = "JPEG (Joint Picture Experts Group) Image Format";
Index: format_pcm.c
===================================================================
RCS file: /usr/cvsroot/asterisk/formats/format_pcm.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- format_pcm.c 18 Dec 2004 22:04:06 -0000 1.17
+++ format_pcm.c 29 Mar 2005 04:49:24 -0000 1.18
@@ -17,6 +17,7 @@
#include <asterisk/logger.h>
#include <asterisk/sched.h>
#include <asterisk/module.h>
+#include <asterisk/endian.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <stdlib.h>
@@ -25,15 +26,6 @@
#include <unistd.h>
#include <errno.h>
#include <string.h>
-#ifdef __linux__
-#include <endian.h>
-#else
-#ifdef SOLARIS
-#include "solaris-compat/compat.h"
-#else
-#include <machine/endian.h>
-#endif
-#endif
#define BUF_SIZE 160 /* 160 samples */
Index: format_pcm_alaw.c
===================================================================
RCS file: /usr/cvsroot/asterisk/formats/format_pcm_alaw.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- format_pcm_alaw.c 18 Dec 2004 22:04:06 -0000 1.15
+++ format_pcm_alaw.c 29 Mar 2005 04:49:24 -0000 1.16
@@ -17,6 +17,7 @@
#include <asterisk/logger.h>
#include <asterisk/sched.h>
#include <asterisk/module.h>
+#include <asterisk/endian.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <stdlib.h>
@@ -27,15 +28,6 @@
#include <unistd.h>
#include <errno.h>
#include <string.h>
-#ifdef __linux__
-#include <endian.h>
-#else
-#ifdef SOLARIS
-#include "solaris-compat/compat.h"
-#else
-#include <machine/endian.h>
-#endif
-#endif
#define BUF_SIZE 160 /* 160 samples */
Index: format_sln.c
===================================================================
RCS file: /usr/cvsroot/asterisk/formats/format_sln.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- format_sln.c 19 Dec 2004 21:13:41 -0000 1.4
+++ format_sln.c 29 Mar 2005 04:49:24 -0000 1.5
@@ -15,6 +15,7 @@
#include <asterisk/logger.h>
#include <asterisk/sched.h>
#include <asterisk/module.h>
+#include <asterisk/endian.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <stdlib.h>
@@ -23,15 +24,6 @@
#include <unistd.h>
#include <errno.h>
#include <string.h>
-#ifdef __linux__
-#include <endian.h>
-#else
-#ifdef SOLARIS
-#include "solaris-compat/compat.h"
-#else
-#include <machine/endian.h>
-#endif
-#endif
#define BUF_SIZE 320 /* 320 samples */
Index: format_vox.c
===================================================================
RCS file: /usr/cvsroot/asterisk/formats/format_vox.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- format_vox.c 14 Dec 2004 23:36:30 -0000 1.18
+++ format_vox.c 29 Mar 2005 04:49:24 -0000 1.19
@@ -17,6 +17,7 @@
#include <asterisk/logger.h>
#include <asterisk/sched.h>
#include <asterisk/module.h>
+#include <asterisk/endian.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <stdlib.h>
@@ -25,15 +26,6 @@
#include <unistd.h>
#include <errno.h>
#include <string.h>
-#ifdef __linux__
-#include <endian.h>
-#else
-#ifdef SOLARIS
-#include "solaris-compat/compat.h"
-#else
-#include <machine/endian.h>
-#endif
-#endif
#define BUF_SIZE 80 /* 160 samples */
Index: format_wav.c
===================================================================
RCS file: /usr/cvsroot/asterisk/formats/format_wav.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- format_wav.c 18 Dec 2004 22:04:06 -0000 1.21
+++ format_wav.c 29 Mar 2005 04:49:24 -0000 1.22
@@ -17,6 +17,7 @@
#include <asterisk/logger.h>
#include <asterisk/sched.h>
#include <asterisk/module.h>
+#include <asterisk/endian.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <stdlib.h>
@@ -25,15 +26,6 @@
#include <unistd.h>
#include <errno.h>
#include <string.h>
-#ifdef __linux__
-#include <endian.h>
-#else
-#ifdef SOLARIS
-#include "solaris-compat/compat.h"
-#else
-#include <machine/endian.h>
-#endif
-#endif
/* Some Ideas for this code came from makewave.c by Jeffrey Chilton */
Index: format_wav_gsm.c
===================================================================
RCS file: /usr/cvsroot/asterisk/formats/format_wav_gsm.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- format_wav_gsm.c 23 Mar 2005 04:30:31 -0000 1.30
+++ format_wav_gsm.c 29 Mar 2005 04:49:24 -0000 1.31
@@ -17,6 +17,7 @@
#include <asterisk/logger.h>
#include <asterisk/sched.h>
#include <asterisk/module.h>
+#include <asterisk/endian.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <stdlib.h>
@@ -25,15 +26,6 @@
#include <unistd.h>
#include <errno.h>
#include <string.h>
-#ifdef __linux__
-#include <endian.h>
-#else
-#ifdef SOLARIS
-#include "solaris-compat/compat.h"
-#else
-#include <machine/endian.h>
-#endif
-#endif
#include "msgsm.h"
/* Some Ideas for this code came from makewave.c by Jeffrey Chilton */
More information about the svn-commits
mailing list