kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 03:50:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add two widely used constants

Browse Source 
#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
This commit is contained in:
Luigi Rizzo
2006-03-29 02:12:31 +00:00
parent 150e0b72cc
commit 68ab41ebfe
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/asterisk.h
View File

@@ -20,6 +20,9 @@
#define DEFAULT_LANGUAGE "en" #define DEFAULT_LANGUAGE "en"
#define DEFAULT_SAMPLE_RATE 8000
#define DEFAULT_SAMPLES_PER_MS ((DEFAULT_SAMPLE_RATE)/1000)
#define AST_CONFIG_MAX_PATH 255 #define AST_CONFIG_MAX_PATH 255
/* provided in asterisk.c */ /* provided in asterisk.c */

2
include/asterisk/plc.h
View File

@@ -95,8 +95,6 @@ When a real packet is not available in time, call plc_fillin() to create a sythe
That's it! That's it!
*/ */
#define SAMPLE_RATE 8000
/*! Minimum allowed pitch (66 Hz) */ /*! Minimum allowed pitch (66 Hz) */
#define PLC_PITCH_MIN 120 #define PLC_PITCH_MIN 120
/*! Maximum allowed pitch (200 Hz) */ /*! Maximum allowed pitch (200 Hz) */

2
plc.c
View File

@@ -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. */ /* 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 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) static inline int16_t fsaturate(double damp)
{ {