Merge pull request #776 in FS/freeswitch from ~PIOTRGREGOR/freeswitch:feature/FS-8988-avmd-rename-files to master
* commit '906e844010a4f8e9d3733160ed7410900ee1e292': FS-8988 Rename files
This commit is contained in:
commit
462ab95426
|
@ -2,7 +2,7 @@ include $(top_srcdir)/build/modmake.rulesam
|
||||||
MODNAME=mod_avmd
|
MODNAME=mod_avmd
|
||||||
|
|
||||||
mod_LTLIBRARIES = mod_avmd.la
|
mod_LTLIBRARIES = mod_avmd.la
|
||||||
mod_avmd_la_SOURCES = mod_avmd.c amplitude.c buffer.c desa2.c goertzel.c fast_acosf.c
|
mod_avmd_la_SOURCES = mod_avmd.c avmd_amplitude.c avmd_buffer.c avmd_desa2.c avmd_goertzel.c avmd_fast_acosf.c
|
||||||
mod_avmd_la_CFLAGS = $(AM_CFLAGS) $(AM_MOD_AVMD_CXXFLAGS)
|
mod_avmd_la_CFLAGS = $(AM_CFLAGS) $(AM_MOD_AVMD_CXXFLAGS)
|
||||||
mod_avmd_la_LIBADD = $(switch_builddir)/libfreeswitch.la
|
mod_avmd_la_LIBADD = $(switch_builddir)/libfreeswitch.la
|
||||||
mod_avmd_la_LDFLAGS = -avoid-version -module -no-undefined -shared
|
mod_avmd_la_LDFLAGS = -avoid-version -module -no-undefined -shared
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#ifndef __AMPLITUDE_H__
|
#ifndef __AMPLITUDE_H__
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
#include "amplitude.h"
|
#include "avmd_amplitude.h"
|
||||||
#include "psi.h"
|
#include "avmd_psi.h"
|
||||||
|
|
||||||
/*! \brief
|
/*! \brief
|
||||||
* @author Eric des Courtis
|
* @author Eric des Courtis
|
|
@ -1,6 +1,6 @@
|
||||||
#ifndef __AMPLITUDE_H__
|
#ifndef __AMPLITUDE_H__
|
||||||
#define __AMPLITUDE_H__
|
#define __AMPLITUDE_H__
|
||||||
#include "buffer.h"
|
#include "avmd_buffer.h"
|
||||||
|
|
||||||
extern double amplitude(circ_buffer_t *, size_t i, double f);
|
extern double amplitude(circ_buffer_t *, size_t i, double f);
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
#ifndef __BUFFER_H__
|
#ifndef __BUFFER_H__
|
||||||
#include "buffer.h"
|
#include "avmd_buffer.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
extern size_t next_power_of_2(size_t v)
|
extern size_t next_power_of_2(size_t v)
|
|
@ -6,12 +6,12 @@
|
||||||
#else
|
#else
|
||||||
#define ISNAN(x) (isnan(x))
|
#define ISNAN(x) (isnan(x))
|
||||||
#endif
|
#endif
|
||||||
#include "buffer.h"
|
#include "avmd_buffer.h"
|
||||||
#include "desa2.h"
|
#include "avmd_desa2.h"
|
||||||
#include "options.h"
|
#include "avmd_options.h"
|
||||||
|
|
||||||
#ifdef AVMD_FAST_MATH
|
#ifdef AVMD_FAST_MATH
|
||||||
#include "fast_acosf.h"
|
#include "avmd_fast_acosf.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
extern double desa2(circ_buffer_t *b, size_t i)
|
extern double desa2(circ_buffer_t *b, size_t i)
|
|
@ -1,7 +1,7 @@
|
||||||
#ifndef __DESA2_H__
|
#ifndef __DESA2_H__
|
||||||
#define __DESA2_H__
|
#define __DESA2_H__
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
#include "buffer.h"
|
#include "avmd_buffer.h"
|
||||||
|
|
||||||
extern double desa2(circ_buffer_t *b, size_t i);
|
extern double desa2(circ_buffer_t *b, size_t i);
|
||||||
#endif
|
#endif
|
|
@ -17,8 +17,8 @@
|
||||||
#ifndef _MSC_VER
|
#ifndef _MSC_VER
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#endif
|
#endif
|
||||||
#include "fast_acosf.h"
|
#include "avmd_fast_acosf.h"
|
||||||
#include "options.h"
|
#include "avmd_options.h"
|
||||||
|
|
||||||
#ifdef AVMD_FAST_MATH
|
#ifdef AVMD_FAST_MATH
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#ifndef __GOERTZEL_H__
|
#ifndef __GOERTZEL_H__
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
#include "goertzel.h"
|
#include "avmd_goertzel.h"
|
||||||
#include "buffer.h"
|
#include "avmd_buffer.h"
|
||||||
|
|
||||||
/*! \brief Identify frequency components of a signal
|
/*! \brief Identify frequency components of a signal
|
||||||
* @author Eric des Courtis
|
* @author Eric des Courtis
|
|
@ -4,7 +4,7 @@
|
||||||
#ifndef _MSC_VER
|
#ifndef _MSC_VER
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#endif
|
#endif
|
||||||
#include "buffer.h"
|
#include "avmd_buffer.h"
|
||||||
|
|
||||||
#if !defined(M_PI)
|
#if !defined(M_PI)
|
||||||
/* C99 systems may not define M_PI */
|
/* C99 systems may not define M_PI */
|
|
@ -1,6 +1,6 @@
|
||||||
#ifndef __PSI_H__
|
#ifndef __PSI_H__
|
||||||
#define __PSI_H__
|
#define __PSI_H__
|
||||||
#include "buffer.h"
|
#include "avmd_buffer.h"
|
||||||
|
|
||||||
#define PSI(b, i) (GET_SAMPLE((b), ((i) + 1))*GET_SAMPLE((b), ((i) + 1))-GET_SAMPLE((b), ((i) + 2))*GET_SAMPLE((b), ((i) + 0)))
|
#define PSI(b, i) (GET_SAMPLE((b), ((i) + 1))*GET_SAMPLE((b), ((i) + 1))-GET_SAMPLE((b), ((i) + 2))*GET_SAMPLE((b), ((i) + 0)))
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
#endif
|
#endif
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include "buffer.h"
|
#include "avmd_buffer.h"
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
size_t len;
|
size_t len;
|
|
@ -6,37 +6,37 @@
|
||||||
</Filter>
|
</Filter>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClInclude Include="amplitude.h">
|
<ClInclude Include="avmd_amplitude.h">
|
||||||
<Filter>Header Files</Filter>
|
<Filter>Header Files</Filter>
|
||||||
</ClInclude>
|
</ClInclude>
|
||||||
<ClInclude Include="buffer.h">
|
<ClInclude Include="avmd_buffer.h">
|
||||||
<Filter>Header Files</Filter>
|
<Filter>Header Files</Filter>
|
||||||
</ClInclude>
|
</ClInclude>
|
||||||
<ClInclude Include="desa2.h">
|
<ClInclude Include="avmd_desa2.h">
|
||||||
<Filter>Header Files</Filter>
|
<Filter>Header Files</Filter>
|
||||||
</ClInclude>
|
</ClInclude>
|
||||||
<ClInclude Include="fast_acosf.h">
|
<ClInclude Include="avmd_fast_acosf.h">
|
||||||
<Filter>Header Files</Filter>
|
<Filter>Header Files</Filter>
|
||||||
</ClInclude>
|
</ClInclude>
|
||||||
<ClInclude Include="goertzel.h">
|
<ClInclude Include="avmd_goertzel.h">
|
||||||
<Filter>Header Files</Filter>
|
<Filter>Header Files</Filter>
|
||||||
</ClInclude>
|
</ClInclude>
|
||||||
<ClInclude Include="options.h">
|
<ClInclude Include="avmd_options.h">
|
||||||
<Filter>Header Files</Filter>
|
<Filter>Header Files</Filter>
|
||||||
</ClInclude>
|
</ClInclude>
|
||||||
<ClInclude Include="psi.h">
|
<ClInclude Include="avmd_psi.h">
|
||||||
<Filter>Header Files</Filter>
|
<Filter>Header Files</Filter>
|
||||||
</ClInclude>
|
</ClInclude>
|
||||||
<ClInclude Include="sma_buf.h">
|
<ClInclude Include="avmd_sma_buf.h">
|
||||||
<Filter>Header Files</Filter>
|
<Filter>Header Files</Filter>
|
||||||
</ClInclude>
|
</ClInclude>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClCompile Include="amplitude.c" />
|
<ClCompile Include="avmd_amplitude.c" />
|
||||||
<ClCompile Include="buffer.c" />
|
<ClCompile Include="avmd_buffer.c" />
|
||||||
<ClCompile Include="desa2.c" />
|
<ClCompile Include="avmd_desa2.c" />
|
||||||
<ClCompile Include="fast_acosf.c" />
|
<ClCompile Include="avmd_fast_acosf.c" />
|
||||||
<ClCompile Include="goertzel.c" />
|
<ClCompile Include="avmd_goertzel.c" />
|
||||||
<ClCompile Include="mod_avmd.c" />
|
<ClCompile Include="mod_avmd.c" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
|
@ -124,21 +124,21 @@
|
||||||
</Link>
|
</Link>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClInclude Include="amplitude.h" />
|
<ClInclude Include="avmd_amplitude.h" />
|
||||||
<ClInclude Include="buffer.h" />
|
<ClInclude Include="avmd_buffer.h" />
|
||||||
<ClInclude Include="desa2.h" />
|
<ClInclude Include="avmd_desa2.h" />
|
||||||
<ClInclude Include="fast_acosf.h" />
|
<ClInclude Include="avmd_fast_acosf.h" />
|
||||||
<ClInclude Include="goertzel.h" />
|
<ClInclude Include="avmd_goertzel.h" />
|
||||||
<ClInclude Include="options.h" />
|
<ClInclude Include="avmd_options.h" />
|
||||||
<ClInclude Include="psi.h" />
|
<ClInclude Include="avmd_psi.h" />
|
||||||
<ClInclude Include="sma_buf.h" />
|
<ClInclude Include="avmd_sma_buf.h" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClCompile Include="amplitude.c" />
|
<ClCompile Include="avmd_amplitude.c" />
|
||||||
<ClCompile Include="buffer.c" />
|
<ClCompile Include="avmd_buffer.c" />
|
||||||
<ClCompile Include="desa2.c" />
|
<ClCompile Include="avmd_desa2.c" />
|
||||||
<ClCompile Include="fast_acosf.c" />
|
<ClCompile Include="avmd_fast_acosf.c" />
|
||||||
<ClCompile Include="goertzel.c" />
|
<ClCompile Include="avmd_goertzel.c" />
|
||||||
<ClCompile Include="mod_avmd.c" />
|
<ClCompile Include="mod_avmd.c" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|
|
@ -43,16 +43,16 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
#include "amplitude.h"
|
#include "avmd_amplitude.h"
|
||||||
#include "buffer.h"
|
#include "avmd_buffer.h"
|
||||||
#include "desa2.h"
|
#include "avmd_desa2.h"
|
||||||
//#include "goertzel.h"
|
//#include "avmd_goertzel.h"
|
||||||
#include "psi.h"
|
#include "avmd_psi.h"
|
||||||
#include "sma_buf.h"
|
#include "avmd_sma_buf.h"
|
||||||
#include "options.h"
|
#include "avmd_options.h"
|
||||||
|
|
||||||
#ifdef AVMD_FAST_MATH
|
#ifdef AVMD_FAST_MATH
|
||||||
#include "fast_acosf.h"
|
#include "avmd_fast_acosf.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue