Changeset b235c0e for src/spectral


Ignore:
Timestamp:
Dec 11, 2013, 1:04:27 AM (10 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:
c7ec2c6
Parents:
3194dca1
Message:

src/: sync header defines, remove trailing spaces, update copyrights

Signed-off-by: Paul Brossier <​piem@piem.org>

Location:
src/spectral
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • src/spectral/fft.h

    r3194dca1 rb235c0e  
    11/*
    2   Copyright (C) 2003-2009 Paul Brossier <piem@aubio.org>
     2  Copyright (C) 2003-2013 Paul Brossier <piem@aubio.org>
    33
    44  This file is part of aubio.
    … …  
    2727*/
    2828
    29 #ifndef FFT_H_
    30 #define FFT_H_
     29#ifndef _AUBIO_FFT_H
     30#define _AUBIO_FFT_H
    3131
    3232#ifdef __cplusplus
    … …  
    140140#endif
    141141
    142 #endif // FFT_H_
     142#endif /* _AUBIO_FFT_H */

  • src/spectral/filterbank.h

    r3194dca1 rb235c0e  
    11/*
    2   Copyright (C) 2007-2009 Paul Brossier <piem@aubio.org>
     2  Copyright (C) 2007-2013 Paul Brossier <piem@aubio.org>
    33                      and Amaury Hazan <ahazan@iua.upf.edu>
    44
    … …  
    3030*/
    3131
    32 #ifndef FILTERBANK_H
    33 #define FILTERBANK_H
     32#ifndef _AUBIO_FILTERBANK_H
     33#define _AUBIO_FILTERBANK_H
    3434
    3535#ifdef __cplusplus
    … …  
    8888#endif
    8989
    90 #endif                          // FILTERBANK_H
     90#endif /* _AUBIO_FILTERBANK_H */

  • src/spectral/filterbank_mel.h

    r3194dca1 rb235c0e  
    11/*
    2   Copyright (C) 2007-2009 Paul Brossier <piem@aubio.org>
     2  Copyright (C) 2007-2013 Paul Brossier <piem@aubio.org>
    33                      and Amaury Hazan <ahazan@iua.upf.edu>
    44
    … …  
    3232*/
    3333
    34 #ifndef FILTERBANK_MEL_H
    35 #define FILTERBANK_MEL_H
     34#ifndef _AUBIO_FILTERBANK_MEL_H
     35#define _AUBIO_FILTERBANK_MEL_H
    3636
    3737#ifdef __cplusplus
    … …  
    7070#endif
    7171
    72 #endif // FILTERBANK_MEL_H
     72#endif /* _AUBIO_FILTERBANK_MEL_H */

  • src/spectral/mfcc.h

    r3194dca1 rb235c0e  
    11/*
    2   Copyright (C) 2007-2009 Paul Brossier <piem@aubio.org>
     2  Copyright (C) 2007-2013 Paul Brossier <piem@aubio.org>
    33                      and Amaury Hazan <ahazan@iua.upf.edu>
    44
    … …  
    2828*/
    2929
    30 #ifndef MFCC_H
    31 #define MFCC_H
     30#ifndef _AUBIO_MFCC_H
     31#define _AUBIO_MFCC_H
    3232
    3333#ifdef __cplusplus
    … …  
    7070#endif
    7171
    72 #endif                          // MFCC_H
     72#endif /* _AUBIO_MFCC_H */

  • src/spectral/phasevoc.h

    r3194dca1 rb235c0e  
    11/*
    2   Copyright (C) 2003-2009 Paul Brossier <piem@aubio.org>
     2  Copyright (C) 2003-2013 Paul Brossier <piem@aubio.org>
    33
    44  This file is part of aubio.
    … …  
    3232*/
    3333
    34 #ifndef _PHASEVOC_H
    35 #define _PHASEVOC_H
     34#ifndef _AUBIO_PHASEVOC_H
     35#define _AUBIO_PHASEVOC_H
    3636
    3737#ifdef __cplusplus
    … …  
    100100#endif
    101101
    102 #endif
     102#endif /* _AUBIO_PHASEVOC_H */

  • src/spectral/specdesc.h

    r3194dca1 rb235c0e  
    11/*
    2   Copyright (C) 2003-2009 Paul Brossier <piem@aubio.org>
     2  Copyright (C) 2003-2013 Paul Brossier <piem@aubio.org>
    33
    44  This file is part of aubio.
    … …  
    2020
    2121/** \file
    22  
     22
    2323  Spectral description functions
    24  
     24
    2525  All of the following spectral description functions take as arguments the FFT
    2626  of a windowed signal (as created with aubio_pvoc). They output one smpl_t per
    2727  buffer (stored in a vector of size [1]).
    28  
     28
    2929  \section specdesc Spectral description functions
    3030
    … …  
    3535  These functions are designed to raise at notes attacks in music signals.
    3636
    37   \b \p energy : Energy based onset detection function 
    38  
     37  \b \p energy : Energy based onset detection function
     38
    3939  This function calculates the local energy of the input spectral frame.
    40  
     40
    4141  \b \p hfc : High Frequency Content onset detection function
    42  
     42
    4343  This method computes the High Frequency Content (HFC) of the input spectral
    4444  frame. The resulting function is efficient at detecting percussive onsets.
    … …  
    4747  Musical Signal. PhD dissertation, University of Bristol, UK, 1996.
    4848
    49   \b \p complex : Complex Domain Method onset detection function 
    50  
     49  \b \p complex : Complex Domain Method onset detection function
     50
    5151  Christopher Duxbury, Mike E. Davies, and Mark B. Sandler. Complex domain
    5252  onset detection for musical signals. In Proceedings of the Digital Audio
    5353  Effects Conference, DAFx-03, pages 90-93, London, UK, 2003.
    5454
    55   \b \p phase : Phase Based Method onset detection function 
     55  \b \p phase : Phase Based Method onset detection function
    5656
    5757  Juan-Pablo Bello, Mike P. Davies, and Mark B. Sandler. Phase-based note onset
    … …  
    6060  Hong-Kong, 2003.
    6161
    62   \b \p specdiff : Spectral difference method onset detection function 
     62  \b \p specdiff : Spectral difference method onset detection function
    6363
    6464  Jonhatan Foote and Shingo Uchihashi. The beat spectrum: a new approach to
    … …  
    6666  (ICME 2001), pages 881­884, Tokyo, Japan, August 2001.
    6767
    68   \b \p kl : Kullback-Liebler onset detection function 
    69  
     68  \b \p kl : Kullback-Liebler onset detection function
     69
    7070  Stephen Hainsworth and Malcom Macleod. Onset detection in music audio
    7171  signals. In Proceedings of the International Computer Music Conference
    7272  (ICMC), Singapore, 2003.
    7373
    74   \b \p mkl : Modified Kullback-Liebler onset detection function 
     74  \b \p mkl : Modified Kullback-Liebler onset detection function
    7575
    7676  Paul Brossier, ``Automatic annotation of musical audio for interactive
    … …  
    7878  music, Queen Mary University of London, London, UK, 2006.
    7979
    80   \b \p specflux : Spectral Flux 
     80  \b \p specflux : Spectral Flux
    8181
    8282  Simon Dixon, Onset Detection Revisited, in ``Proceedings of the 9th
    8383  International Conference on Digital Audio Effects'' (DAFx-06), Montreal,
    84   Canada, 2006. 
     84  Canada, 2006.
    8585
    8686  \subsection shapedesc Spectral shape descriptors
    … …  
    9393  href="http://www.ircam.fr/anasyn/peeters/ARTICLES/Peeters_2003_cuidadoaudiofeatures.pdf">pdf</a>)
    9494
    95   \b \p centroid : Spectral centroid 
     95  \b \p centroid : Spectral centroid
    9696
    9797  The spectral centroid represents the barycenter of the spectrum.
    9898
    9999  \e Note: This function returns the result in bin. To get the spectral
    100   centroid in Hz, aubio_bintofreq() should be used. 
     100  centroid in Hz, aubio_bintofreq() should be used.
    101101
    102   \b \p spread : Spectral spread 
     102  \b \p spread : Spectral spread
    103103
    104104  The spectral spread is the variance of the spectral distribution around its
    … …  
    126126  Wikipedia.
    127127
    128   \b \p slope : Spectral slope 
     128  \b \p slope : Spectral slope
    129129
    130130  The spectral slope represents decreasing rate of the spectral amplitude,
    … …  
    133133  \b \p decrease : Spectral decrease
    134134
    135   The spectral decrease is another representation of the decreasing rate, 
     135  The spectral decrease is another representation of the decreasing rate,
    136136  based on perceptual criteria.
    137137
    … …  
    146146
    147147
    148 #ifndef ONSETDETECTION_H
    149 #define ONSETDETECTION_H
     148#ifndef _AUBIO_SPECDESC_H
     149#define _AUBIO_SPECDESC_H
    150150
    151151#ifdef __cplusplus
    … …  
    156156typedef struct _aubio_specdesc_t aubio_specdesc_t;
    157157
    158 /** execute spectral description function on a spectral frame 
     158/** execute spectral description function on a spectral frame
    159159
    160160  Generic function to compute spectral detescription.
    161  
     161
    162162  \param o spectral description object as returned by new_aubio_specdesc()
    163163  \param fftgrain input signal spectrum as computed by aubio_pvoc_do
    … …  
    168168    fvec_t * desc);
    169169
    170 /** creation of a spectral description object 
     170/** creation of a spectral description object
    171171
    172172  \param method spectral description method
    … …  
    181181aubio_specdesc_t *new_aubio_specdesc (char_t * method, uint_t buf_size);
    182182
    183 /** deletion of a spectral descriptor 
     183/** deletion of a spectral descriptor
    184184
    185185  \param o spectral descriptor object as returned by new_aubio_specdesc()
    … …  
    192192#endif
    193193
    194 #endif /* ONSETDETECTION_H */
     194#endif /* _AUBIO_SPECDESC_H */

  • src/spectral/tss.h

    r3194dca1 rb235c0e  
    11/*
    2   Copyright (C) 2003-2009 Paul Brossier <piem@aubio.org>
     2  Copyright (C) 2003-2013 Paul Brossier <piem@aubio.org>
    33
    44  This file is part of aubio.
    … …  
    3737*/
    3838
    39 #ifndef TSS_H
    40 #define TSS_H
     39#ifndef _AUBIO_TSS_H
     40#define _AUBIO_TSS_H
    4141
    4242#ifdef __cplusplus
    … …  
    101101#endif
    102102
    103 #endif /*TSS_H*/
     103#endif /* _AUBIO_TSS_H */
Note: See TracChangeset for help on using the changeset viewer.