[asterisk-commits] qwell: branch qwell/codec_consistency r110575 - /team/qwell/codec_consistency...

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Fri Mar 21 14:05:11 CDT 2008


Author: qwell
Date: Fri Mar 21 14:05:10 2008
New Revision: 110575

URL: http://svn.digium.com/view/asterisk?view=rev&rev=110575
Log:
Make codecs/ dir a little bit prettier, from a files standpoint.

Added:
    team/qwell/codec_consistency/codecs/ex_adpcm.h
      - copied, changed from r110574, team/qwell/codec_consistency/codecs/adpcm_ex.h
    team/qwell/codec_consistency/codecs/ex_alaw.h
      - copied, changed from r110574, team/qwell/codec_consistency/codecs/alaw_ex.h
    team/qwell/codec_consistency/codecs/ex_g722.h
      - copied, changed from r110574, team/qwell/codec_consistency/codecs/g722_ex.h
    team/qwell/codec_consistency/codecs/ex_g726.h
      - copied, changed from r110574, team/qwell/codec_consistency/codecs/g726_ex.h
    team/qwell/codec_consistency/codecs/ex_gsm.h
      - copied, changed from r110574, team/qwell/codec_consistency/codecs/gsm_ex.h
    team/qwell/codec_consistency/codecs/ex_ilbc.h
      - copied, changed from r110574, team/qwell/codec_consistency/codecs/ilbc_ex.h
    team/qwell/codec_consistency/codecs/ex_lpc10.h
      - copied, changed from r110574, team/qwell/codec_consistency/codecs/lpc10_ex.h
    team/qwell/codec_consistency/codecs/ex_slin.h
      - copied, changed from r110574, team/qwell/codec_consistency/codecs/slin_ex.h
    team/qwell/codec_consistency/codecs/ex_slin16.h
      - copied, changed from r110574, team/qwell/codec_consistency/codecs/slin16_ex.h
    team/qwell/codec_consistency/codecs/ex_speex.h
      - copied, changed from r110574, team/qwell/codec_consistency/codecs/speex_ex.h
    team/qwell/codec_consistency/codecs/ex_ulaw.h
      - copied, changed from r110574, team/qwell/codec_consistency/codecs/ulaw_ex.h
Removed:
    team/qwell/codec_consistency/codecs/adpcm_ex.h
    team/qwell/codec_consistency/codecs/alaw_ex.h
    team/qwell/codec_consistency/codecs/g722_ex.h
    team/qwell/codec_consistency/codecs/g726_ex.h
    team/qwell/codec_consistency/codecs/gsm_ex.h
    team/qwell/codec_consistency/codecs/ilbc_ex.h
    team/qwell/codec_consistency/codecs/lpc10_ex.h
    team/qwell/codec_consistency/codecs/slin16_ex.h
    team/qwell/codec_consistency/codecs/slin_ex.h
    team/qwell/codec_consistency/codecs/speex_ex.h
    team/qwell/codec_consistency/codecs/ulaw_ex.h
Modified:
    team/qwell/codec_consistency/codecs/codec_a_mu.c
    team/qwell/codec_consistency/codecs/codec_adpcm.c
    team/qwell/codec_consistency/codecs/codec_alaw.c
    team/qwell/codec_consistency/codecs/codec_g722.c
    team/qwell/codec_consistency/codecs/codec_g726.c
    team/qwell/codec_consistency/codecs/codec_gsm.c
    team/qwell/codec_consistency/codecs/codec_ilbc.c
    team/qwell/codec_consistency/codecs/codec_lpc10.c
    team/qwell/codec_consistency/codecs/codec_resample.c
    team/qwell/codec_consistency/codecs/codec_speex.c
    team/qwell/codec_consistency/codecs/codec_ulaw.c

Modified: team/qwell/codec_consistency/codecs/codec_a_mu.c
URL: http://svn.digium.com/view/asterisk/team/qwell/codec_consistency/codecs/codec_a_mu.c?view=diff&rev=110575&r1=110574&r2=110575
==============================================================================
--- team/qwell/codec_consistency/codecs/codec_a_mu.c (original)
+++ team/qwell/codec_consistency/codecs/codec_a_mu.c Fri Mar 21 14:05:10 2008
@@ -40,8 +40,8 @@
 
 /* Sample frame data */
 
-#include "ulaw_ex.h"
-#include "alaw_ex.h"
+#include "ex_ulaw.h"
+#include "ex_alaw.h"
 
 /*! \brief convert frame data and store into the buffer */
 static int alawtoulaw_framein(struct ast_trans_pvt *pvt, struct ast_frame *f)
@@ -83,12 +83,12 @@
 	static struct ast_frame f;
 	f.frametype = AST_FRAME_VOICE;
 	f.subclass = AST_FORMAT_ALAW;
-	f.datalen = sizeof(alaw_ex);
-	f.samples = sizeof(alaw_ex);
+	f.datalen = sizeof(ex_alaw);
+	f.samples = sizeof(ex_alaw);
 	f.mallocd = 0;
 	f.offset = 0;
 	f.src = __PRETTY_FUNCTION__;
-	f.data = alaw_ex; /* XXX what ? */
+	f.data = ex_alaw; /* XXX what ? */
 	return &f;
 }
 
@@ -97,12 +97,12 @@
 	static struct ast_frame f;
 	f.frametype = AST_FRAME_VOICE;
 	f.subclass = AST_FORMAT_ULAW;
-	f.datalen = sizeof(ulaw_ex);
-	f.samples = sizeof(ulaw_ex);
+	f.datalen = sizeof(ex_ulaw);
+	f.samples = sizeof(ex_ulaw);
 	f.mallocd = 0;
 	f.offset = 0;
 	f.src = __PRETTY_FUNCTION__;
-	f.data = ulaw_ex;
+	f.data = ex_ulaw;
 	return &f;
 }
 

Modified: team/qwell/codec_consistency/codecs/codec_adpcm.c
URL: http://svn.digium.com/view/asterisk/team/qwell/codec_consistency/codecs/codec_adpcm.c?view=diff&rev=110575&r1=110574&r2=110575
==============================================================================
--- team/qwell/codec_consistency/codecs/codec_adpcm.c (original)
+++ team/qwell/codec_consistency/codecs/codec_adpcm.c Fri Mar 21 14:05:10 2008
@@ -45,8 +45,8 @@
 
 /* Sample frame data */
 
-#include "slin_ex.h"
-#include "adpcm_ex.h"
+#include "ex_slin.h"
+#include "ex_adpcm.h"
 
 /*
  * Step size index shift table 
@@ -291,12 +291,12 @@
 	static struct ast_frame f;
 	f.frametype = AST_FRAME_VOICE;
 	f.subclass = AST_FORMAT_ADPCM;
-	f.datalen = sizeof(adpcm_ex);
-	f.samples = sizeof(adpcm_ex) * 2;
+	f.datalen = sizeof(ex_adpcm);
+	f.samples = sizeof(ex_adpcm) * 2;
 	f.mallocd = 0;
 	f.offset = 0;
 	f.src = __PRETTY_FUNCTION__;
-	f.data = adpcm_ex;
+	f.data = ex_adpcm;
 	return &f;
 }
 
@@ -306,13 +306,13 @@
 	static struct ast_frame f;
 	f.frametype = AST_FRAME_VOICE;
 	f.subclass = AST_FORMAT_SLINEAR;
-	f.datalen = sizeof(slin8_ex);
+	f.datalen = sizeof(ex_slin8);
 	/* Assume 8000 Hz */
-	f.samples = sizeof(slin8_ex) / 2;
+	f.samples = sizeof(ex_slin8) / 2;
 	f.mallocd = 0;
 	f.offset = 0;
 	f.src = __PRETTY_FUNCTION__;
-	f.data = slin8_ex;
+	f.data = ex_slin8;
 	return &f;
 }
 

Modified: team/qwell/codec_consistency/codecs/codec_alaw.c
URL: http://svn.digium.com/view/asterisk/team/qwell/codec_consistency/codecs/codec_alaw.c?view=diff&rev=110575&r1=110574&r2=110575
==============================================================================
--- team/qwell/codec_consistency/codecs/codec_alaw.c (original)
+++ team/qwell/codec_consistency/codecs/codec_alaw.c Fri Mar 21 14:05:10 2008
@@ -37,8 +37,8 @@
 
 /* Sample frame data */
 
-#include "slin_ex.h"
-#include "alaw_ex.h"
+#include "ex_slin.h"
+#include "ex_alaw.h"
 
 /*! \brief decode frame into lin and fill output buffer. */
 static int alawtolin_framein(struct ast_trans_pvt *pvt, struct ast_frame *f)
@@ -78,12 +78,12 @@
 	static struct ast_frame f;
 	f.frametype = AST_FRAME_VOICE;
 	f.subclass = AST_FORMAT_ALAW;
-	f.datalen = sizeof(alaw_ex);
-	f.samples = sizeof(alaw_ex);
+	f.datalen = sizeof(ex_alaw);
+	f.samples = sizeof(ex_alaw);
 	f.mallocd = 0;
 	f.offset = 0;
 	f.src = __PRETTY_FUNCTION__;
-	f.data = alaw_ex;
+	f.data = ex_alaw;
 	return &f;
 }
 
@@ -93,12 +93,12 @@
 	static struct ast_frame f;
 	f.frametype = AST_FRAME_VOICE;
 	f.subclass = AST_FORMAT_SLINEAR;
-	f.datalen = sizeof(slin8_ex);
-	f.samples = sizeof(slin8_ex) / 2;
+	f.datalen = sizeof(ex_slin8);
+	f.samples = sizeof(ex_slin8) / 2;
 	f.mallocd = 0;
 	f.offset = 0;
 	f.src = __PRETTY_FUNCTION__;
-	f.data = slin8_ex;
+	f.data = ex_slin8;
 	return &f;
 }
 

Modified: team/qwell/codec_consistency/codecs/codec_g722.c
URL: http://svn.digium.com/view/asterisk/team/qwell/codec_consistency/codecs/codec_g722.c?view=diff&rev=110575&r1=110574&r2=110575
==============================================================================
--- team/qwell/codec_consistency/codecs/codec_g722.c (original)
+++ team/qwell/codec_consistency/codecs/codec_g722.c Fri Mar 21 14:05:10 2008
@@ -49,9 +49,9 @@
 /* Sample frame data */
 
 #include "g722/g722.h"
-#include "slin_ex.h"
-#include "slin16_ex.h"
-#include "g722_ex.h"
+#include "ex_slin.h"
+#include "ex_slin16.h"
+#include "ex_g722.h"
 
 struct g722_encoder_pvt {
 	g722_encode_state_t g722;
@@ -138,10 +138,10 @@
 	static struct ast_frame f = {
 		.frametype = AST_FRAME_VOICE,
 		.subclass = AST_FORMAT_G722,
-		.datalen = sizeof(g722_ex),
-		.samples = sizeof(g722_ex) * 2,
+		.datalen = sizeof(ex_g722),
+		.samples = sizeof(ex_g722) * 2,
 		.src = __PRETTY_FUNCTION__,
-		.data = g722_ex,
+		.data = ex_g722,
 	};
 
 	return &f;
@@ -152,10 +152,10 @@
 	static struct ast_frame f = {
 		.frametype = AST_FRAME_VOICE,
 		.subclass = AST_FORMAT_SLINEAR,
-		.datalen = sizeof(slin8_ex),
-		.samples = sizeof(slin8_ex) / sizeof(slin8_ex[0]),
+		.datalen = sizeof(ex_slin8),
+		.samples = sizeof(ex_slin8) / sizeof(ex_slin8[0]),
 		.src = __PRETTY_FUNCTION__,
-		.data = slin8_ex,
+		.data = ex_slin8,
 	};
 
 	return &f;
@@ -166,10 +166,10 @@
 	static struct ast_frame f = {
 		.frametype = AST_FRAME_VOICE,
 		.subclass = AST_FORMAT_SLINEAR16,
-		.datalen = sizeof(slin16_ex),
-		.samples = sizeof(slin16_ex) / sizeof(slin16_ex[0]),
+		.datalen = sizeof(ex_slin16),
+		.samples = sizeof(ex_slin16) / sizeof(ex_slin16[0]),
 		.src = __PRETTY_FUNCTION__,
-		.data = slin16_ex,
+		.data = ex_slin16,
 	};
 
 	return &f;

Modified: team/qwell/codec_consistency/codecs/codec_g726.c
URL: http://svn.digium.com/view/asterisk/team/qwell/codec_consistency/codecs/codec_g726.c?view=diff&rev=110575&r1=110574&r2=110575
==============================================================================
--- team/qwell/codec_consistency/codecs/codec_g726.c (original)
+++ team/qwell/codec_consistency/codecs/codec_g726.c Fri Mar 21 14:05:10 2008
@@ -59,8 +59,8 @@
 
 /* Sample frame data */
 
-#include "slin_ex.h"
-#include "g726_ex.h"
+#include "ex_slin.h"
+#include "ex_g726.h"
 
 /*
  * The following is the definition of the state structure
@@ -791,10 +791,10 @@
 	static struct ast_frame f = {
 		.frametype = AST_FRAME_VOICE,
 		.subclass = AST_FORMAT_G726,
-		.datalen = sizeof(g726_ex),
-		.samples = sizeof(g726_ex) * 2,	/* 2 samples per byte */
+		.datalen = sizeof(ex_g726),
+		.samples = sizeof(ex_g726) * 2,	/* 2 samples per byte */
 		.src = __PRETTY_FUNCTION__,
-		.data = g726_ex,
+		.data = ex_g726,
 	};
 
 	return &f;
@@ -805,10 +805,10 @@
 	static struct ast_frame f = {
 		.frametype = AST_FRAME_VOICE,
 		.subclass = AST_FORMAT_SLINEAR,
-		.datalen = sizeof(slin8_ex),
-		.samples = sizeof(slin8_ex) / 2,	/* 1 sample per 2 bytes */
+		.datalen = sizeof(ex_slin8),
+		.samples = sizeof(ex_slin8) / 2,	/* 1 sample per 2 bytes */
 		.src = __PRETTY_FUNCTION__,
-		.data = slin8_ex,
+		.data = ex_slin8,
 	};
 
 	return &f;

Modified: team/qwell/codec_consistency/codecs/codec_gsm.c
URL: http://svn.digium.com/view/asterisk/team/qwell/codec_consistency/codecs/codec_gsm.c?view=diff&rev=110575&r1=110574&r2=110575
==============================================================================
--- team/qwell/codec_consistency/codecs/codec_gsm.c (original)
+++ team/qwell/codec_consistency/codecs/codec_gsm.c Fri Mar 21 14:05:10 2008
@@ -48,8 +48,8 @@
 #include "../formats/msgsm.h"
 
 /* Sample frame data */
-#include "slin_ex.h"
-#include "gsm_ex.h"
+#include "ex_slin.h"
+#include "ex_gsm.h"
 
 #define BUFFER_SAMPLES	8000
 #define GSM_SAMPLES	160
@@ -73,13 +73,13 @@
 	static struct ast_frame f;
 	f.frametype = AST_FRAME_VOICE;
 	f.subclass = AST_FORMAT_SLINEAR;
-	f.datalen = sizeof(slin8_ex);
+	f.datalen = sizeof(ex_slin8);
 	/* Assume 8000 Hz */
-	f.samples = sizeof(slin8_ex)/2;
+	f.samples = sizeof(ex_slin8)/2;
 	f.mallocd = 0;
 	f.offset = 0;
 	f.src = __PRETTY_FUNCTION__;
-	f.data = slin8_ex;
+	f.data = ex_slin8;
 	return &f;
 }
 
@@ -88,13 +88,13 @@
 	static struct ast_frame f;
 	f.frametype = AST_FRAME_VOICE;
 	f.subclass = AST_FORMAT_GSM;
-	f.datalen = sizeof(gsm_ex);
+	f.datalen = sizeof(ex_gsm);
 	/* All frames are 20 ms long */
 	f.samples = GSM_SAMPLES;
 	f.mallocd = 0;
 	f.offset = 0;
 	f.src = __PRETTY_FUNCTION__;
-	f.data = gsm_ex;
+	f.data = ex_gsm;
 	return &f;
 }
 

Modified: team/qwell/codec_consistency/codecs/codec_ilbc.c
URL: http://svn.digium.com/view/asterisk/team/qwell/codec_consistency/codecs/codec_ilbc.c?view=diff&rev=110575&r1=110574&r2=110575
==============================================================================
--- team/qwell/codec_consistency/codecs/codec_ilbc.c (original)
+++ team/qwell/codec_consistency/codecs/codec_ilbc.c Fri Mar 21 14:05:10 2008
@@ -37,8 +37,8 @@
 #include "ilbc/iLBC_decode.h"
 
 /* Sample frame data */
-#include "slin_ex.h"
-#include "ilbc_ex.h"
+#include "ex_slin.h"
+#include "ex_ilbc.h"
 
 #define USE_ILBC_ENHANCER	0
 #define ILBC_MS 			30
@@ -78,12 +78,12 @@
 	static struct ast_frame f;
 	f.frametype = AST_FRAME_VOICE;
 	f.subclass = AST_FORMAT_SLINEAR;
-	f.datalen = sizeof(slin8_ex);
-	f.samples = sizeof(slin8_ex)/2;
+	f.datalen = sizeof(ex_slin8);
+	f.samples = sizeof(ex_slin8)/2;
 	f.mallocd = 0;
 	f.offset = 0;
 	f.src = __PRETTY_FUNCTION__;
-	f.data = slin8_ex;
+	f.data = ex_slin8;
 	return &f;
 }
 
@@ -92,13 +92,13 @@
 	static struct ast_frame f;
 	f.frametype = AST_FRAME_VOICE;
 	f.subclass = AST_FORMAT_ILBC;
-	f.datalen = sizeof(ilbc_ex);
+	f.datalen = sizeof(ex_ilbc);
 	/* All frames are 30 ms long */
 	f.samples = ILBC_SAMPLES;
 	f.mallocd = 0;
 	f.offset = 0;
 	f.src = __PRETTY_FUNCTION__;
-	f.data = ilbc_ex;
+	f.data = ex_ilbc;
 	return &f;
 }
 

Modified: team/qwell/codec_consistency/codecs/codec_lpc10.c
URL: http://svn.digium.com/view/asterisk/team/qwell/codec_consistency/codecs/codec_lpc10.c?view=diff&rev=110575&r1=110574&r2=110575
==============================================================================
--- team/qwell/codec_consistency/codecs/codec_lpc10.c (original)
+++ team/qwell/codec_consistency/codecs/codec_lpc10.c Fri Mar 21 14:05:10 2008
@@ -39,8 +39,8 @@
 #include "lpc10/lpc10.h"
 
 /* Sample frame data */
-#include "slin_ex.h"
-#include "lpc10_ex.h"
+#include "ex_slin.h"
+#include "ex_lpc10.h"
 
 /* We use a very strange format here...  I have no idea why...  The frames are 180
    samples long, which isn't even an even number of milliseconds...  Not only that
@@ -80,13 +80,13 @@
 	static struct ast_frame f;
 	f.frametype = AST_FRAME_VOICE;
 	f.subclass = AST_FORMAT_SLINEAR;
-	f.datalen = sizeof(slin8_ex);
+	f.datalen = sizeof(ex_slin8);
 	/* Assume 8000 Hz */
 	f.samples = LPC10_SAMPLES_PER_FRAME;
 	f.mallocd = 0;
 	f.offset = 0;
 	f.src = __PRETTY_FUNCTION__;
-	f.data = slin8_ex;
+	f.data = ex_slin8;
 	return &f;
 }
 
@@ -95,14 +95,14 @@
 	static struct ast_frame f;
 	f.frametype = AST_FRAME_VOICE;
 	f.subclass = AST_FORMAT_LPC10;
-	f.datalen = sizeof(lpc10_ex);
+	f.datalen = sizeof(ex_lpc10);
 	/* All frames are 22 ms long (maybe a little more -- why did he choose
 	   LPC10_SAMPLES_PER_FRAME sample frames anyway?? */
 	f.samples = LPC10_SAMPLES_PER_FRAME;
 	f.mallocd = 0;
 	f.offset = 0;
 	f.src = __PRETTY_FUNCTION__;
-	f.data = lpc10_ex;
+	f.data = ex_lpc10;
 	return &f;
 }
 

Modified: team/qwell/codec_consistency/codecs/codec_resample.c
URL: http://svn.digium.com/view/asterisk/team/qwell/codec_consistency/codecs/codec_resample.c?view=diff&rev=110575&r1=110574&r2=110575
==============================================================================
--- team/qwell/codec_consistency/codecs/codec_resample.c (original)
+++ team/qwell/codec_consistency/codecs/codec_resample.c Fri Mar 21 14:05:10 2008
@@ -41,8 +41,8 @@
 #include "asterisk/translate.h"
 #include "asterisk/libresample.h"
 
-#include "slin_ex.h"
-#include "slin16_ex.h"
+#include "ex_slin.h"
+#include "ex_slin16.h"
 
 #define RESAMPLER_QUALITY 0
 
@@ -166,10 +166,10 @@
 	static struct ast_frame f = {
 		.frametype = AST_FRAME_VOICE,
 		.subclass = AST_FORMAT_SLINEAR16,
-		.datalen = sizeof(slin16_ex),
-		.samples = sizeof(slin16_ex) / sizeof(slin16_ex[0]),
+		.datalen = sizeof(ex_slin16),
+		.samples = sizeof(ex_slin16) / sizeof(ex_slin16[0]),
 		.src = __PRETTY_FUNCTION__,
-		.data = slin16_ex,
+		.data = ex_slin16,
 	};
 
 	return &f;
@@ -180,10 +180,10 @@
 	static struct ast_frame f = {
 		.frametype = AST_FRAME_VOICE,
 		.subclass = AST_FORMAT_SLINEAR,
-		.datalen = sizeof(slin8_ex),
-		.samples = sizeof(slin8_ex) / sizeof(slin8_ex[0]),
+		.datalen = sizeof(ex_slin8),
+		.samples = sizeof(ex_slin8) / sizeof(ex_slin8[0]),
 		.src = __PRETTY_FUNCTION__,
-		.data = slin8_ex,
+		.data = ex_slin8,
 	};
 
 	return &f;

Modified: team/qwell/codec_consistency/codecs/codec_speex.c
URL: http://svn.digium.com/view/asterisk/team/qwell/codec_consistency/codecs/codec_speex.c?view=diff&rev=110575&r1=110574&r2=110575
==============================================================================
--- team/qwell/codec_consistency/codecs/codec_speex.c (original)
+++ team/qwell/codec_consistency/codecs/codec_speex.c Fri Mar 21 14:05:10 2008
@@ -53,8 +53,8 @@
 #include "asterisk/utils.h"
 
 /* Sample frame data */
-#include "slin_ex.h"
-#include "speex_ex.h"
+#include "ex_slin.h"
+#include "ex_speex.h"
 
 /* codec variables */
 static int quality = 3;
@@ -158,13 +158,13 @@
 	static struct ast_frame f;
 	f.frametype = AST_FRAME_VOICE;
 	f.subclass = AST_FORMAT_SLINEAR;
-	f.datalen = sizeof(slin8_ex);
+	f.datalen = sizeof(ex_slin8);
 	/* Assume 8000 Hz */
-	f.samples = sizeof(slin8_ex)/2;
+	f.samples = sizeof(ex_slin8)/2;
 	f.mallocd = 0;
 	f.offset = 0;
 	f.src = __PRETTY_FUNCTION__;
-	f.data = slin8_ex;
+	f.data = ex_slin8;
 	return &f;
 }
 
@@ -173,13 +173,13 @@
 	static struct ast_frame f;
 	f.frametype = AST_FRAME_VOICE;
 	f.subclass = AST_FORMAT_SPEEX;
-	f.datalen = sizeof(speex_ex);
+	f.datalen = sizeof(ex_speex);
 	/* All frames are 20 ms long */
 	f.samples = SPEEX_SAMPLES;
 	f.mallocd = 0;
 	f.offset = 0;
 	f.src = __PRETTY_FUNCTION__;
-	f.data = speex_ex;
+	f.data = ex_speex;
 	return &f;
 }
 

Modified: team/qwell/codec_consistency/codecs/codec_ulaw.c
URL: http://svn.digium.com/view/asterisk/team/qwell/codec_consistency/codecs/codec_ulaw.c?view=diff&rev=110575&r1=110574&r2=110575
==============================================================================
--- team/qwell/codec_consistency/codecs/codec_ulaw.c (original)
+++ team/qwell/codec_consistency/codecs/codec_ulaw.c Fri Mar 21 14:05:10 2008
@@ -37,8 +37,8 @@
 
 /* Sample frame data */
 
-#include "slin_ex.h"
-#include "ulaw_ex.h"
+#include "ex_slin.h"
+#include "ex_ulaw.h"
 
 /*! \brief convert and store samples in outbuf */
 static int ulawtolin_framein(struct ast_trans_pvt *pvt, struct ast_frame *f)
@@ -79,12 +79,12 @@
 	static struct ast_frame f;
 	f.frametype = AST_FRAME_VOICE;
 	f.subclass = AST_FORMAT_ULAW;
-	f.datalen = sizeof(ulaw_ex);
-	f.samples = sizeof(ulaw_ex);
+	f.datalen = sizeof(ex_ulaw);
+	f.samples = sizeof(ex_ulaw);
 	f.mallocd = 0;
 	f.offset = 0;
 	f.src = __PRETTY_FUNCTION__;
-	f.data = ulaw_ex;
+	f.data = ex_ulaw;
 	return &f;
 }
 
@@ -97,13 +97,13 @@
 	static struct ast_frame f;
 	f.frametype = AST_FRAME_VOICE;
 	f.subclass = AST_FORMAT_SLINEAR;
-	f.datalen = sizeof(slin8_ex);
+	f.datalen = sizeof(ex_slin8);
 	/* Assume 8000 Hz */
-	f.samples = sizeof(slin8_ex) / 2;
+	f.samples = sizeof(ex_slin8) / 2;
 	f.mallocd = 0;
 	f.offset = 0;
 	f.src = __PRETTY_FUNCTION__;
-	f.data = slin8_ex;
+	f.data = ex_slin8;
 	return &f;
 }
 

Copied: team/qwell/codec_consistency/codecs/ex_adpcm.h (from r110574, team/qwell/codec_consistency/codecs/adpcm_ex.h)
URL: http://svn.digium.com/view/asterisk/team/qwell/codec_consistency/codecs/ex_adpcm.h?view=diff&rev=110575&p1=team/qwell/codec_consistency/codecs/adpcm_ex.h&r1=110574&p2=team/qwell/codec_consistency/codecs/ex_adpcm.h&r2=110575
==============================================================================
--- team/qwell/codec_consistency/codecs/adpcm_ex.h (original)
+++ team/qwell/codec_consistency/codecs/ex_adpcm.h Fri Mar 21 14:05:10 2008
@@ -9,7 +9,7 @@
  *
  */
 
-static unsigned char adpcm_ex[] = {
+static unsigned char ex_adpcm[] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };

Copied: team/qwell/codec_consistency/codecs/ex_alaw.h (from r110574, team/qwell/codec_consistency/codecs/alaw_ex.h)
URL: http://svn.digium.com/view/asterisk/team/qwell/codec_consistency/codecs/ex_alaw.h?view=diff&rev=110575&p1=team/qwell/codec_consistency/codecs/alaw_ex.h&r1=110574&p2=team/qwell/codec_consistency/codecs/ex_alaw.h&r2=110575
==============================================================================
--- team/qwell/codec_consistency/codecs/alaw_ex.h (original)
+++ team/qwell/codec_consistency/codecs/ex_alaw.h Fri Mar 21 14:05:10 2008
@@ -9,7 +9,7 @@
  *
  */
 
-static unsigned char alaw_ex[] = {
+static unsigned char ex_alaw[] = {
 	0x00, 0x03, 0x06, 0x09, 0x0c, 0x0f, 0x12, 0x15,
 	0x10, 0x18, 0x1b, 0x1e, 0x21, 0x24, 0x27, 0x2a,
 	0x20, 0x2d, 0x30, 0x33, 0x36, 0x39, 0x3c, 0x3f,

Copied: team/qwell/codec_consistency/codecs/ex_g722.h (from r110574, team/qwell/codec_consistency/codecs/g722_ex.h)
URL: http://svn.digium.com/view/asterisk/team/qwell/codec_consistency/codecs/ex_g722.h?view=diff&rev=110575&p1=team/qwell/codec_consistency/codecs/g722_ex.h&r1=110574&p2=team/qwell/codec_consistency/codecs/ex_g722.h&r2=110575
==============================================================================
--- team/qwell/codec_consistency/codecs/g722_ex.h (original)
+++ team/qwell/codec_consistency/codecs/ex_g722.h Fri Mar 21 14:05:10 2008
@@ -9,7 +9,7 @@
  *
  */
 
-static unsigned char g722_ex[] = {
+static unsigned char ex_g722[] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };

Copied: team/qwell/codec_consistency/codecs/ex_g726.h (from r110574, team/qwell/codec_consistency/codecs/g726_ex.h)
URL: http://svn.digium.com/view/asterisk/team/qwell/codec_consistency/codecs/ex_g726.h?view=diff&rev=110575&p1=team/qwell/codec_consistency/codecs/g726_ex.h&r1=110574&p2=team/qwell/codec_consistency/codecs/ex_g726.h&r2=110575
==============================================================================
--- team/qwell/codec_consistency/codecs/g726_ex.h (original)
+++ team/qwell/codec_consistency/codecs/ex_g726.h Fri Mar 21 14:05:10 2008
@@ -9,7 +9,7 @@
  *
  */
 
-static unsigned char g726_ex[] = {
+static unsigned char ex_g726[] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };

Copied: team/qwell/codec_consistency/codecs/ex_gsm.h (from r110574, team/qwell/codec_consistency/codecs/gsm_ex.h)
URL: http://svn.digium.com/view/asterisk/team/qwell/codec_consistency/codecs/ex_gsm.h?view=diff&rev=110575&p1=team/qwell/codec_consistency/codecs/gsm_ex.h&r1=110574&p2=team/qwell/codec_consistency/codecs/ex_gsm.h&r2=110575
==============================================================================
--- team/qwell/codec_consistency/codecs/gsm_ex.h (original)
+++ team/qwell/codec_consistency/codecs/ex_gsm.h Fri Mar 21 14:05:10 2008
@@ -9,7 +9,7 @@
   *
   */
 
-static unsigned char gsm_ex[] = {
+static unsigned char ex_gsm[] = {
 	0xda, 0xa6, 0xac, 0x2d, 0xa3, 0x50, 0x00, 0x49, 0x24, 0x92, 
 	0x49, 0x24, 0x50, 0x40, 0x49, 0x24, 0x92, 0x37, 0x24, 0x52, 
 	0x00, 0x49, 0x24, 0x92, 0x47, 0x24, 0x50, 0x80, 0x46, 0xe3, 

Copied: team/qwell/codec_consistency/codecs/ex_ilbc.h (from r110574, team/qwell/codec_consistency/codecs/ilbc_ex.h)
URL: http://svn.digium.com/view/asterisk/team/qwell/codec_consistency/codecs/ex_ilbc.h?view=diff&rev=110575&p1=team/qwell/codec_consistency/codecs/ilbc_ex.h&r1=110574&p2=team/qwell/codec_consistency/codecs/ex_ilbc.h&r2=110575
==============================================================================
--- team/qwell/codec_consistency/codecs/ilbc_ex.h (original)
+++ team/qwell/codec_consistency/codecs/ex_ilbc.h Fri Mar 21 14:05:10 2008
@@ -9,7 +9,7 @@
   *
   */
 
-static unsigned char ilbc_ex[] = {
+static unsigned char ex_ilbc[] = {
 	0xff, 0xa0, 0xff, 0xfa, 0x0f, 0x60, 0x12, 0x11, 0xa2, 0x47, 
 	0x22, 0x8c, 0x00, 0x00, 0x01, 0x02, 0x80, 0x43, 0xa0, 0x40, 
 	0x33, 0xff, 0xcf, 0xc0, 0xf3, 0xf3, 0x3f, 0x8f, 0x3f, 0xff, 

Copied: team/qwell/codec_consistency/codecs/ex_lpc10.h (from r110574, team/qwell/codec_consistency/codecs/lpc10_ex.h)
URL: http://svn.digium.com/view/asterisk/team/qwell/codec_consistency/codecs/ex_lpc10.h?view=diff&rev=110575&p1=team/qwell/codec_consistency/codecs/lpc10_ex.h&r1=110574&p2=team/qwell/codec_consistency/codecs/ex_lpc10.h&r2=110575
==============================================================================
--- team/qwell/codec_consistency/codecs/lpc10_ex.h (original)
+++ team/qwell/codec_consistency/codecs/ex_lpc10.h Fri Mar 21 14:05:10 2008
@@ -9,6 +9,6 @@
   *
   */
 
-static unsigned char lpc10_ex[] = {
+static unsigned char ex_lpc10[] = {
 	0x01, 0x08, 0x31, 0x08, 0x31, 0x80, 0x30,
 };

Copied: team/qwell/codec_consistency/codecs/ex_slin.h (from r110574, team/qwell/codec_consistency/codecs/slin_ex.h)
URL: http://svn.digium.com/view/asterisk/team/qwell/codec_consistency/codecs/ex_slin.h?view=diff&rev=110575&p1=team/qwell/codec_consistency/codecs/slin_ex.h&r1=110574&p2=team/qwell/codec_consistency/codecs/ex_slin.h&r2=110575
==============================================================================
--- team/qwell/codec_consistency/codecs/slin_ex.h (original)
+++ team/qwell/codec_consistency/codecs/ex_slin.h Fri Mar 21 14:05:10 2008
@@ -8,7 +8,7 @@
  * Distributed under the terms of the GNU General Public License
  */
 
-static signed short slin8_ex[] = {
+static signed short ex_slin8[] = {
 	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
 	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
 };

Copied: team/qwell/codec_consistency/codecs/ex_slin16.h (from r110574, team/qwell/codec_consistency/codecs/slin16_ex.h)
URL: http://svn.digium.com/view/asterisk/team/qwell/codec_consistency/codecs/ex_slin16.h?view=diff&rev=110575&p1=team/qwell/codec_consistency/codecs/slin16_ex.h&r1=110574&p2=team/qwell/codec_consistency/codecs/ex_slin16.h&r2=110575
==============================================================================
--- team/qwell/codec_consistency/codecs/slin16_ex.h (original)
+++ team/qwell/codec_consistency/codecs/ex_slin16.h Fri Mar 21 14:05:10 2008
@@ -8,7 +8,7 @@
  * Distributed under the terms of the GNU General Public License
  */
 
-static signed short slin16_ex[] = {
+static signed short ex_slin16[] = {
 	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
 	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
 	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,

Copied: team/qwell/codec_consistency/codecs/ex_speex.h (from r110574, team/qwell/codec_consistency/codecs/speex_ex.h)
URL: http://svn.digium.com/view/asterisk/team/qwell/codec_consistency/codecs/ex_speex.h?view=diff&rev=110575&p1=team/qwell/codec_consistency/codecs/speex_ex.h&r1=110574&p2=team/qwell/codec_consistency/codecs/ex_speex.h&r2=110575
==============================================================================
--- team/qwell/codec_consistency/codecs/speex_ex.h (original)
+++ team/qwell/codec_consistency/codecs/ex_speex.h Fri Mar 21 14:05:10 2008
@@ -9,7 +9,7 @@
   *
   */
 
-static unsigned char speex_ex[] = {
+static unsigned char ex_speex[] = {
 	0x2e, 0x8e, 0x0f, 0x9a, 0x20, 0000, 0x01, 0x7f, 0xff, 0xff, 
 	0xff, 0xff, 0xff, 0x91, 0000, 0xbf, 0xff, 0xff, 0xff, 0xff, 
 	0xff, 0xdc, 0x80, 0x5f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 

Copied: team/qwell/codec_consistency/codecs/ex_ulaw.h (from r110574, team/qwell/codec_consistency/codecs/ulaw_ex.h)
URL: http://svn.digium.com/view/asterisk/team/qwell/codec_consistency/codecs/ex_ulaw.h?view=diff&rev=110575&p1=team/qwell/codec_consistency/codecs/ulaw_ex.h&r1=110574&p2=team/qwell/codec_consistency/codecs/ex_ulaw.h&r2=110575
==============================================================================
--- team/qwell/codec_consistency/codecs/ulaw_ex.h (original)
+++ team/qwell/codec_consistency/codecs/ex_ulaw.h Fri Mar 21 14:05:10 2008
@@ -9,7 +9,7 @@
  *
  */
 
-static unsigned char ulaw_ex[] = {
+static unsigned char ex_ulaw[] = {
 	0x00, 0x03, 0x06, 0x09, 0x0c, 0x0f, 0x12, 0x15,
 	0x10, 0x18, 0x1b, 0x1e, 0x21, 0x24, 0x27, 0x2a,
 	0x20, 0x2d, 0x30, 0x33, 0x36, 0x39, 0x3c, 0x3f,




More information about the asterisk-commits mailing list