Changeset b4b0324


Ignore:
Timestamp:
Aug 9, 2005, 10:58:47 AM (19 years ago)
Author:
Paul Brossier <piem@altern.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:
32669d9
Parents:
876c5e7
Message:

protect window types with aubio_win_

Files:
5 edited

Legend:

Unmodified
Added
Removed
  • examples/tests/test-fft.c

    r876c5e7 rb4b0324  
    2020                spec[i] = AUBIO_ARRAY(fft_data_t,win_s);
    2121        /* initialize the window (see mathutils.c) */
    22         window(w,win_s,hanningz);
     22        window(w,win_s,aubio_win_hanningz);
    2323 
    2424        /* fill input with some data */
  • src/mathutils.c

    r876c5e7 rb4b0324  
    2424#include "mathutils.h"
    2525
    26 void window(smpl_t *w, uint_t size, window_type_t wintype) {
     26void window(smpl_t *w, uint_t size, aubio_window_type_t wintype) {
    2727  uint_t i;
    2828  switch(wintype) {
    29     case rectangle:
     29    case aubio_win_rectangle:
    3030      for (i=0;i<size;i++)
    3131        w[i] = 0.5;
    3232      break;
    33     case hamming:
     33    case aubio_win_hamming:
    3434      for (i=0;i<size;i++)
    3535        w[i] = 0.54 - 0.46 * COS(TWO_PI * i / (size));
    3636      break;
    37     case hanning:
     37    case aubio_win_hanning:
    3838      for (i=0;i<size;i++)
    3939        w[i] = 0.5 - (0.5 * COS(TWO_PI * i / (size)));
    4040      break;
    41     case hanningz:
     41    case aubio_win_hanningz:
    4242      for (i=0;i<size;i++)
    4343        w[i] = 0.5 * (1.0 - COS(TWO_PI * i / (size)));
    4444      break;
    45     case blackman:
     45    case aubio_win_blackman:
    4646      for (i=0;i<size;i++)
    4747        w[i] = 0.42
     
    4949          +     0.08 * COS(2.0*TWO_PI*i/(size-1.0));
    5050      break;
    51     case blackman_harris:
     51    case aubio_win_blackman_harris:
    5252      for (i=0;i<size;i++)
    5353        w[i] = 0.35875
     
    5656          - 0.01168 * COS(3.0*TWO_PI*i/(size-1.0));
    5757      break;
    58     case gaussian:
     58    case aubio_win_gaussian:
    5959      for (i=0;i<size;i++)
    6060        w[i] = EXP(- 1.0 / SQR(size) * SQR(2.0*i-size));
    6161      break;
    62     case welch:
     62    case aubio_win_welch:
    6363      for (i=0;i<size;i++)
    6464        w[i] = 1.0 - SQR((2*i-size)/(size+1.0));
    6565      break;
    66     case parzen:
     66    case aubio_win_parzen:
    6767      for (i=0;i<size;i++)
    6868        w[i] = 1.0 - fabsf((2*i-size)/(size+1.0));
  • src/mathutils.h

    r876c5e7 rb4b0324  
    9595
    9696typedef enum {
    97         rectangle,         
    98         hamming,
    99         hanning,
    100         hanningz,
    101         blackman,
    102         blackman_harris,
    103         gaussian,
    104         welch,
    105         parzen
    106 } window_type_t;
     97        aubio_win_rectangle,         
     98        aubio_win_hamming,
     99        aubio_win_hanning,
     100        aubio_win_hanningz,
     101        aubio_win_blackman,
     102        aubio_win_blackman_harris,
     103        aubio_win_gaussian,
     104        aubio_win_welch,
     105        aubio_win_parzen
     106} aubio_window_type_t;
    107107
    108108/** create window */
    109 void window(smpl_t *w, uint_t size, window_type_t wintype);
     109void window(smpl_t *w, uint_t size, aubio_window_type_t wintype);
    110110
    111111/** principal argument
  • src/phasevoc.c

    r876c5e7 rb4b0324  
    114114        pv->synthold = new_fvec (win_s-hop_s, channels);
    115115        pv->w        = AUBIO_ARRAY(smpl_t,win_s);
    116         window(pv->w,win_s,hanningz);
     116        window(pv->w,win_s,aubio_win_hanningz);
    117117
    118118        pv->channels = channels;
  • swig/aubio.i

    r876c5e7 rb4b0324  
    8989/* mathutils */
    9090typedef enum {
    91         rectangle,
    92         hamming,
    93         hanning,
    94         hanningz,
    95         blackman,
    96         blackman_harris,
    97         gaussian,
    98         welch,
    99         parzen
    100 } window_type_t;
    101 
    102 void window(smpl_t *w, uint_t size, window_type_t wintype);
     91        aubio_win_rectangle,
     92        aubio_win_hamming,
     93        aubio_win_hanning,
     94        aubio_win_hanningz,
     95        aubio_win_blackman,
     96        aubio_win_blackman_harris,
     97        aubio_win_gaussian,
     98        aubio_win_welch,
     99        aubio_win_parzen
     100} aubio_window_type_t;
     101
     102void window(smpl_t *w, uint_t size, aubio_window_type_t wintype);
    103103smpl_t unwrap2pi (smpl_t phase);
    104104smpl_t vec_mean(fvec_t *s);
Note: See TracChangeset for help on using the changeset viewer.