[Asterisk-cvs] asterisk/codecs codec_a_mu.c,1.5,1.6 codec_adpcm.c,1.9,1.10 codec_alaw.c,1.5,1.6 codec_g723_1.c,1.13,1.14 codec_g726.c,1.1,1.2 codec_gsm.c,1.11,1.12 codec_ilbc.c,1.4,1.5 codec_lpc10.c,1.7,1.8 codec_speex.c,1.4,1.5 codec_ulaw.c,1.6,1.7

markster at lists.digium.com markster at lists.digium.com
Tue Jun 8 20:42:08 CDT 2004


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

Modified Files:
	codec_a_mu.c codec_adpcm.c codec_alaw.c codec_g723_1.c 
	codec_g726.c codec_gsm.c codec_ilbc.c codec_lpc10.c 
	codec_speex.c codec_ulaw.c 
Log Message:
Merge FreeBSD locking fixes (bug #1411)


Index: codec_a_mu.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/codec_a_mu.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- codec_a_mu.c	13 Aug 2003 15:25:16 -0000	1.5
+++ codec_a_mu.c	9 Jun 2004 01:45:08 -0000	1.6
@@ -27,7 +27,7 @@
 
 #define BUFFER_SIZE   8096	/* size for the translation buffers */
 
-static ast_mutex_t localuser_lock = AST_MUTEX_INITIALIZER;
+AST_MUTEX_DEFINE_STATIC(localuser_lock);
 static int localusecnt = 0;
 
 static char *tdesc = "A-law and Mulaw direct Coder/Decoder";

Index: codec_adpcm.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/codec_adpcm.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- codec_adpcm.c	11 Mar 2004 20:56:26 -0000	1.9
+++ codec_adpcm.c	9 Jun 2004 01:45:08 -0000	1.10
@@ -28,7 +28,7 @@
 
 #define BUFFER_SIZE   8096	/* size for the translation buffers */
 
-static ast_mutex_t localuser_lock = AST_MUTEX_INITIALIZER;
+AST_MUTEX_DEFINE_STATIC(localuser_lock);
 static int localusecnt = 0;
 
 static char *tdesc = "Adaptive Differential PCM Coder/Decoder";

Index: codec_alaw.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/codec_alaw.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- codec_alaw.c	13 Aug 2003 15:25:16 -0000	1.5
+++ codec_alaw.c	9 Jun 2004 01:45:08 -0000	1.6
@@ -26,7 +26,7 @@
 
 #define BUFFER_SIZE   8096	/* size for the translation buffers */
 
-static ast_mutex_t localuser_lock = AST_MUTEX_INITIALIZER;
+AST_MUTEX_DEFINE_STATIC(localuser_lock);
 static int localusecnt = 0;
 
 static char *tdesc = "A-law Coder/Decoder";

Index: codec_g723_1.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/codec_g723_1.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- codec_g723_1.c	4 Apr 2004 16:33:56 -0000	1.13
+++ codec_g723_1.c	9 Jun 2004 01:45:08 -0000	1.14
@@ -56,7 +56,7 @@
 #include "slin_g723_ex.h"
 #include "g723_slin_ex.h"
 
-static ast_mutex_t localuser_lock = AST_MUTEX_INITIALIZER;
+AST_MUTEX_DEFINE_STATIC(localuser_lock);
 static int localusecnt=0;
 
 #ifdef ANNEX_B

Index: codec_g726.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/codec_g726.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- codec_g726.c	25 Feb 2004 04:10:32 -0000	1.1
+++ codec_g726.c	9 Jun 2004 01:45:08 -0000	1.2
@@ -29,7 +29,7 @@
 #define BUFFER_SIZE   8096	/* size for the translation buffers */
 #define BUF_SHIFT	5
 
-static ast_mutex_t localuser_lock = AST_MUTEX_INITIALIZER;
+AST_MUTEX_DEFINE_STATIC(localuser_lock);
 static int localusecnt = 0;
 
 static char *tdesc = "ITU G.726-32kbps G726 Transcoder";

Index: codec_gsm.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/codec_gsm.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- codec_gsm.c	13 Aug 2003 15:25:16 -0000	1.11
+++ codec_gsm.c	9 Jun 2004 01:45:08 -0000	1.12
@@ -39,7 +39,7 @@
 #include "slin_gsm_ex.h"
 #include "gsm_slin_ex.h"
 
-static ast_mutex_t localuser_lock = AST_MUTEX_INITIALIZER;
+AST_MUTEX_DEFINE_STATIC(localuser_lock);
 static int localusecnt=0;
 
 static char *tdesc = "GSM/PCM16 (signed linear) Codec Translator";

Index: codec_ilbc.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/codec_ilbc.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- codec_ilbc.c	22 Apr 2004 03:34:13 -0000	1.4
+++ codec_ilbc.c	9 Jun 2004 01:45:08 -0000	1.5
@@ -35,7 +35,7 @@
 
 #define USE_ILBC_ENHANCER	0
 
-static ast_mutex_t localuser_lock = AST_MUTEX_INITIALIZER;
+AST_MUTEX_DEFINE_STATIC(localuser_lock);
 static int localusecnt=0;
 
 static char *tdesc = "iLBC/PCM16 (signed linear) Codec Translator";

Index: codec_lpc10.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/codec_lpc10.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- codec_lpc10.c	13 Aug 2003 15:25:16 -0000	1.7
+++ codec_lpc10.c	9 Jun 2004 01:45:08 -0000	1.8
@@ -43,7 +43,7 @@
 
 #define LPC10_BYTES_IN_COMPRESSED_FRAME (LPC10_BITS_IN_COMPRESSED_FRAME + 7)/8
 
-static ast_mutex_t localuser_lock = AST_MUTEX_INITIALIZER;
+AST_MUTEX_DEFINE_STATIC(localuser_lock);
 static int localusecnt=0;
 
 static char *tdesc = "LPC10 2.4kbps (signed linear) Voice Coder";

Index: codec_speex.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/codec_speex.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- codec_speex.c	13 Aug 2003 15:25:16 -0000	1.4
+++ codec_speex.c	9 Jun 2004 01:45:08 -0000	1.5
@@ -37,7 +37,7 @@
 #include "slin_speex_ex.h"
 #include "speex_slin_ex.h"
 
-static ast_mutex_t localuser_lock = AST_MUTEX_INITIALIZER;
+AST_MUTEX_DEFINE_STATIC(localuser_lock);
 static int localusecnt=0;
 
 static char *tdesc = "Speex/PCM16 (signed linear) Codec Translator";

Index: codec_ulaw.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/codec_ulaw.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- codec_ulaw.c	13 Aug 2003 15:25:16 -0000	1.6
+++ codec_ulaw.c	9 Jun 2004 01:45:08 -0000	1.7
@@ -26,7 +26,7 @@
 
 #define BUFFER_SIZE   8096	/* size for the translation buffers */
 
-static ast_mutex_t localuser_lock = AST_MUTEX_INITIALIZER;
+AST_MUTEX_DEFINE_STATIC(localuser_lock);
 static int localusecnt = 0;
 
 static char *tdesc = "Mu-law Coder/Decoder";




More information about the svn-commits mailing list