From 034c8b2f009e5f5c7d99763ccf4abf58220a4d22 Mon Sep 17 00:00:00 2001 From: rizzo Date: Wed, 29 Mar 2006 02:12:31 +0000 Subject: 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: http://svn.digium.com/svn/asterisk/trunk@15969 f38db490-d61c-443f-a65b-d21fe96a405b --- include/asterisk.h | 3 +++ include/asterisk/plc.h | 2 -- plc.c | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/asterisk.h b/include/asterisk.h index 7d052bbf3..97682423e 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 a790ca167..22eb738ac 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 5db6f7d1b..f088aa72e 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) { -- cgit v1.2.3