Changeset 06cae6c for src/spectral/filterbank.h

Timestamp:

Sep 17, 2009, 1:20:54 AM (15 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, pitchshift, sampler, timestretch, yinfft+

Children:

3b3b03e

Parents:

7bf3dcb

Message:

src/spectral/filterbank.c: refactorise filter bank, split mel frequency coefficients to src/spectral/filterbank_mel.c, start bumping license to GPLv3

File:

• src/spectral/filterbank.h (modified) (4 diffs)

src/spectral/filterbank.h

@@ -1 +1 @@
 /*
-   Copyright (C) 2007 Amaury Hazan <ahazan@iua.upf.edu>
-                  and Paul Brossier <piem@piem.org>
+  Copyright (C) 2007-2009 Paul Brossier <piem@aubio.org>
+                      and Amaury Hazan <ahazan@iua.upf.edu>
 
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+  This file is part of Aubio.
 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  Aubio is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+  Aubio is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with Aubio.  If not, see <http://www.gnu.org/licenses/>.
+
 */
 
@@ -22 +24 @@
   Filterbank object
 
-  General-purpose spectral filterbank object. Comes with mel-filter initialization function.
+  General-purpose spectral filterbank object.
 
 */
@@ -45 +47 @@
 aubio_filterbank_t * new_aubio_filterbank(uint_t n_filters, uint_t win_s);
 
-/** filterbank initialization for mel filters
-
-  
-  \param n_filters number of filters
-  \param win_s window size
-  \param samplerate
-  \param freq_min lowest filter frequency
-  \param freq_max highest filter frequency
-
-*/
-aubio_filterbank_t * new_aubio_filterbank_mfcc(uint_t n_filters, uint_t win_s, uint_t samplerate, smpl_t freq_min, smpl_t freq_max);
-
 /** destroy filterbank object
 
@@ -66 +56 @@
 /** compute filterbank
 
+  \param fb filterbank containing     nfilt x win_s filter coefficients
+  \param in input spectrum containing chans x win_s spectrum
+  \param out output vector containing chans x nfilt output values
+
 */
 void aubio_filterbank_do(aubio_filterbank_t * fb, cvec_t * in, fvec_t *out);
 
-/** return the vector containing the filter coefficients of one channel
+/** return a pointer to the fvec object containing all filter coefficients 
+
+  \param f filterbank object to get coefficients from
 
  */
-fvec_t * aubio_filterbank_getchannel(aubio_filterbank_t * f, uint_t channel);
+fvec_t * aubio_filterbank_get_coeffs(aubio_filterbank_t * f);
 
 #ifdef __cplusplus