From: Luigi Rizzo <rizzo@icir.org>
Date: Wed, 29 Mar 2006 02:12:31 +0000 (+0000)
Subject: Add two widely used constants
X-Git-Tag: 1.4.0-beta1~2265
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=68ab41ebfe599ad857bb0d4ca1fc892a83545588;p=thirdparty%2Fasterisk.git

Add two widely used constants

#define DEFAULT_SAMPLE_RATE 8000
#define DEFAULT_SAMPLES_PER_MS  ((DEFAULT_SAMPLE_RATE)/1000)

to the main header, and remove equivalent ones from plc.[ch]

This will simplify the cleanup of the codec/ and formats/ files.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@15969 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/include/asterisk.h b/include/asterisk.h
index 7d052bbf33..97682423e1 100644
--- a/include/asterisk.h
+++ b/include/asterisk.h
@@ -20,6 +20,9 @@
 
 #define DEFAULT_LANGUAGE "en"
 
+#define DEFAULT_SAMPLE_RATE 8000
+#define DEFAULT_SAMPLES_PER_MS  ((DEFAULT_SAMPLE_RATE)/1000)
+
 #define AST_CONFIG_MAX_PATH 255
 
 /* provided in asterisk.c */
diff --git a/include/asterisk/plc.h b/include/asterisk/plc.h
index a790ca167f..22eb738ac5 100644
--- a/include/asterisk/plc.h
+++ b/include/asterisk/plc.h
@@ -95,8 +95,6 @@ When a real packet is not available in time, call plc_fillin() to create a sythe
 That's it!
 */
 
-#define SAMPLE_RATE     8000
-
 /*! Minimum allowed pitch (66 Hz) */
 #define PLC_PITCH_MIN           120
 /*! Maximum allowed pitch (200 Hz) */
diff --git a/plc.c b/plc.c
index 5db6f7d1b7..f088aa72e8 100644
--- a/plc.c
+++ b/plc.c
@@ -56,7 +56,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 /* We do a straight line fade to zero volume in 50ms when we are filling in for missing data. */
 #define ATTENUATION_INCREMENT       0.0025			      /* Attenuation per sample */
 
-#define ms_to_samples(t)	    (((t)*SAMPLE_RATE)/1000)
+#define ms_to_samples(t)	    (((t)*DEFAULT_SAMPLE_RATE)/1000)
 
 static inline int16_t fsaturate(double damp)
 {