Changeset c159aeb


Ignore:
Timestamp:
Sep 29, 2009, 7:58:03 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:
a253fd4
Parents:
a4364b8
Message:

src/temporal: rename adesign/adsgn to a_weighting, idem for c_weighting

Files:
5 edited
4 moved

Legend:

Unmodified
Added
Removed

  • src/pitch/pitchdetection.c

    ra4364b8 rc159aeb  
    2424#include "mathutils.h"
    2525#include "temporal/filter.h"
    26 #include "temporal/cdesign.h"
     26#include "temporal/c_weighting.h"
    2727#include "pitch/pitchmcomb.h"
    2828#include "pitch/pitchyin.h"
    … …  
    105105      p->fftgrain = new_cvec(bufsize, channels);
    106106      p->mcomb    = new_aubio_pitchmcomb(bufsize,hopsize,channels,samplerate);
    107       p->filter   = new_aubio_filter_cdsgn (samplerate, channels);
     107      p->filter   = new_aubio_filter_c_weighting (samplerate, channels);
    108108      p->callback = aubio_pitchdetection_mcomb;
    109109      break;

  • src/temporal/a_weighting.c

    ra4364b8 rc159aeb  
    2525#include "lvec.h"
    2626#include "temporal/filter.h"
    27 #include "temporal/adesign.h"
     27#include "temporal/a_weighting.h"
    2828
    29 void aubio_filter_set_adsgn (aubio_filter_t * f) {
     29void aubio_filter_set_a_weighting (aubio_filter_t * f) {
    3030
    3131  uint_t samplerate = aubio_filter_get_samplerate (f);
    … …  
    153153}
    154154
    155 aubio_filter_t * new_aubio_filter_adsgn (uint_t samplerate, uint_t channels) {
     155aubio_filter_t * new_aubio_filter_a_weighting (uint_t samplerate, uint_t channels) {
    156156  aubio_filter_t * f = new_aubio_filter (samplerate, 7, channels);
    157   aubio_filter_set_adsgn (f);
     157  aubio_filter_set_a_weighting (f);
    158158  return f;
    159159}

  • src/temporal/a_weighting.h

    ra4364b8 rc159aeb  
    6464
    6565*/
    66 aubio_filter_t * new_aubio_filter_adsgn (uint_t samplerate, uint_t channels);
     66aubio_filter_t * new_aubio_filter_a_weighting (uint_t samplerate, uint_t channels);
    6767
    6868/** set feedback and feedforward coefficients of a A-weighting filter
    … …  
    7171
    7272*/
    73 void aubio_filter_set_adsgn (aubio_filter_t *f);
     73void aubio_filter_set_a_weighting (aubio_filter_t *f);
    7474
    7575#ifdef __cplusplus

  • src/temporal/c_weighting.c

    ra4364b8 rc159aeb  
    2424#include "lvec.h"
    2525#include "temporal/filter.h"
    26 #include "temporal/cdesign.h"
     26#include "temporal/c_weighting.h"
    2727
    28 void aubio_filter_set_cdsgn (aubio_filter_t * f) {
     28void aubio_filter_set_c_weighting (aubio_filter_t * f) {
    2929
    3030  uint_t samplerate = aubio_filter_get_samplerate (f);
    … …  
    129129}
    130130
    131 aubio_filter_t * new_aubio_filter_cdsgn (uint_t samplerate, uint_t channels) {
     131aubio_filter_t * new_aubio_filter_c_weighting (uint_t samplerate, uint_t channels) {
    132132  aubio_filter_t * f = new_aubio_filter(samplerate, 5, channels);
    133   aubio_filter_set_cdsgn (f);
     133  aubio_filter_set_c_weighting (f);
    134134  return f;
    135135}

  • src/temporal/c_weighting.h

    ra4364b8 rc159aeb  
    6464
    6565*/
    66 aubio_filter_t * new_aubio_filter_cdsgn (uint_t samplerate, uint_t channels);
     66aubio_filter_t * new_aubio_filter_c_weighting (uint_t samplerate, uint_t channels);
    6767
    6868/** set feedback and feedforward coefficients of a C-weighting filter
    … …  
    7171
    7272*/
    73 void aubio_filter_set_cdsgn (aubio_filter_t *f);
     73void aubio_filter_set_c_weighting (aubio_filter_t *f);
    7474
    7575#ifdef __cplusplus

  • src/temporal/filter.h

    ra4364b8 rc159aeb  
    5353
    5454  Some convenience functions are provided:
    55     - new_aubio_filter_adsgn() and aubio_filter_set_adsgn(),
    56     - new_aubio_filter_cdsgn() and aubio_filter_set_cdsgn().
     55    - new_aubio_filter_a_weighting() and aubio_filter_set_a_weighting(),
     56    - new_aubio_filter_c_weighting() and aubio_filter_set_c_weighting().
    5757 
    5858*/

  • tests/src/temporal/test-aweighting.c

    ra4364b8 rc159aeb  
    1111
    1212  for ( samplerate = rates[i]; i < nrates ; i++ ) {
    13     f = new_aubio_filter_adsgn (samplerate, channels);
     13    f = new_aubio_filter_a_weighting (samplerate, channels);
    1414    del_aubio_filter (f);
    1515
    1616    f = new_aubio_filter (samplerate, 7, channels*2);
    17     aubio_filter_set_adsgn (f);
     17    aubio_filter_set_a_weighting (f);
    1818    del_aubio_filter (f);
    1919  }
    2020
    2121  // samplerate unknown
    22   f = new_aubio_filter_adsgn (12089, channels);
     22  f = new_aubio_filter_a_weighting (12089, channels);
    2323  del_aubio_filter (f);
    2424
    2525  // order to small
    2626  f = new_aubio_filter (samplerate, 2, channels*2);
    27   aubio_filter_set_adsgn (f);
     27  aubio_filter_set_a_weighting (f);
    2828  del_aubio_filter (f);
    2929
    3030  // order to big
    3131  f = new_aubio_filter (samplerate, 12, channels*2);
    32   aubio_filter_set_adsgn (f);
     32  aubio_filter_set_a_weighting (f);
    3333  del_aubio_filter (f);
    3434

  • tests/src/temporal/test-cweighting.c

    ra4364b8 rc159aeb  
    1111
    1212  for ( samplerate = rates[i]; i < nrates ; i++ ) {
    13     f = new_aubio_filter_cdsgn (samplerate, channels);
     13    f = new_aubio_filter_c_weighting (samplerate, channels);
    1414    del_aubio_filter (f);
    1515
    1616    f = new_aubio_filter (samplerate, 5, channels*2);
    17     aubio_filter_set_cdsgn (f);
     17    aubio_filter_set_c_weighting (f);
    1818    del_aubio_filter (f);
    1919  }
    2020
    2121  // samplerate unknown
    22   f = new_aubio_filter_cdsgn (12089, channels);
     22  f = new_aubio_filter_c_weighting (12089, channels);
    2323  del_aubio_filter (f);
    2424
    2525  // order to small
    2626  f = new_aubio_filter (samplerate, 2, channels*2);
    27   aubio_filter_set_cdsgn (f);
     27  aubio_filter_set_c_weighting (f);
    2828  del_aubio_filter (f);
    2929
    3030  // order to big
    3131  f = new_aubio_filter (samplerate, 12, channels*2);
    32   aubio_filter_set_cdsgn (f);
     32  aubio_filter_set_c_weighting (f);
    3333  del_aubio_filter (f);
    3434

  • tests/src/test-filter.c

    ra4364b8 rc159aeb  
    99 
    1010        /* allocate fft and other memory space */
    11         aubio_filter_t * o = new_aubio_filter_cdsgn (44100, channels);
     11        aubio_filter_t * o = new_aubio_filter_c_weighting (44100, channels);
    1212
    1313        aubio_filter_do(o,in);
Note: See TracChangeset for help on using the changeset viewer.