RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

less namespace pollution 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14275 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
alex 2004-12-29 19:41:21 +00:00
parent 3fe168658a
commit 47e2a4ad80
3 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libaf/filter.c
View File

@ -114,19 +114,19 @@ int design_fir(unsigned int n, _ftype_t* w, _ftype_t* fc, unsigned int flags, _f
// Get window coefficients
switch(flags & WINDOW_MASK){
case(BOXCAR):
boxcar(n,w); break;
af_window_boxcar(n,w); break;
case(TRIANG):
triang(n,w); break;
af_window_triang(n,w); break;
case(HAMMING):
hamming(n,w); break;
af_window_hamming(n,w); break;
case(HANNING):
hanning(n,w); break;
af_window_hanning(n,w); break;
case(BLACKMAN):
blackman(n,w); break;
af_window_blackman(n,w); break;
case(FLATTOP):
flattop(n,w); break;
af_window_flattop(n,w); break;
case(KAISER):
kaiser(n,w,opt); break;
af_window_kaiser(n,w,opt); break;
default:
return -1;
}

16
libaf/window.c
View File

@ -24,7 +24,7 @@
// n window length
// w buffer for the window parameters
*/
void boxcar(int n, _ftype_t* w)
void af_window_boxcar(int n, _ftype_t* w)
{
int i;
// Calculate window coefficients
@ -44,7 +44,7 @@ void boxcar(int n, _ftype_t* w)
// n window length
// w buffer for the window parameters
*/
void triang(int n, _ftype_t* w)
void af_window_triang(int n, _ftype_t* w)
{
_ftype_t k1 = (_ftype_t)(n & 1);
_ftype_t k2 = 1/((_ftype_t)n + k1);
@ -65,7 +65,7 @@ void triang(int n, _ftype_t* w)
// n window length
// w buffer for the window parameters
*/
void hanning(int n, _ftype_t* w)
void af_window_hanning(int n, _ftype_t* w)
{
int i;
_ftype_t k = 2*M_PI/((_ftype_t)(n+1)); // 2*pi/(N+1)
@ -84,7 +84,7 @@ void hanning(int n, _ftype_t* w)
// n window length
// w buffer for the window parameters
*/
void hamming(int n,_ftype_t* w)
void af_window_hamming(int n,_ftype_t* w)
{
int i;
_ftype_t k = 2*M_PI/((_ftype_t)(n-1)); // 2*pi/(N-1)
@ -103,7 +103,7 @@ void hamming(int n,_ftype_t* w)
// n window length
// w buffer for the window parameters
*/
void blackman(int n,_ftype_t* w)
void af_window_blackman(int n,_ftype_t* w)
{
int i;
_ftype_t k1 = 2*M_PI/((_ftype_t)(n-1)); // 2*pi/(N-1)
@ -123,7 +123,7 @@ void blackman(int n,_ftype_t* w)
// n window length
// w buffer for the window parameters
*/
void flattop(int n,_ftype_t* w)
void af_window_flattop(int n,_ftype_t* w)
{
int i;
_ftype_t k1 = 2*M_PI/((_ftype_t)(n-1)); // 2*pi/(N-1)
@ -142,7 +142,7 @@ void flattop(int n,_ftype_t* w)
*/
#define BIZ_EPSILON 1E-21 // Max error acceptable
_ftype_t besselizero(_ftype_t x)
static _ftype_t besselizero(_ftype_t x)
{
_ftype_t temp;
_ftype_t sum = 1.0;
@ -186,7 +186,7 @@ _ftype_t besselizero(_ftype_t x)
// 8.960 5.7 0.000275 -90
// 10.056 6.4 0.000087 -100
*/
void kaiser(int n, _ftype_t* w, _ftype_t b)
void af_window_kaiser(int n, _ftype_t* w, _ftype_t b)
{
_ftype_t tmp;
_ftype_t k1 = 1.0/besselizero(b);

14
libaf/window.h
View File

@ -22,12 +22,12 @@
#ifndef _WINDOW_H
#define _WINDOW_H 1
extern void boxcar(int n, _ftype_t* w);
extern void triang(int n, _ftype_t* w);
extern void hanning(int n, _ftype_t* w);
extern void hamming(int n,_ftype_t* w);
extern void blackman(int n,_ftype_t* w);
extern void flattop(int n,_ftype_t* w);
extern void kaiser(int n, _ftype_t* w,_ftype_t b);
extern void af_window_boxcar(int n, _ftype_t* w);
extern void af_window_triang(int n, _ftype_t* w);
extern void af_window_hanning(int n, _ftype_t* w);
extern void af_window_hamming(int n,_ftype_t* w);
extern void af_window_blackman(int n,_ftype_t* w);
extern void af_window_flattop(int n,_ftype_t* w);
extern void af_window_kaiser(int n, _ftype_t* w,_ftype_t b);
#endif