Changeset 4ed0ed1


Ignore:
Timestamp:
Dec 17, 2013, 5:30:13 PM (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:
e84ab04
Parents:
1ece4f8
Message:

src/fmat.c: new_fmat() takes height as first argument

Files:
8 edited

Legend:

Unmodified
Added
Removed
  • src/fmat.c

    r1ece4f8 r4ed0ed1  
    2222#include "fmat.h"
    2323
    24 fmat_t * new_fmat (uint_t length, uint_t height) {
     24fmat_t * new_fmat (uint_t height, uint_t length) {
    2525  if ((sint_t)length <= 0 || (sint_t)height <= 0 ) {
    2626    return NULL;
  • src/fmat.h

    r1ece4f8 r4ed0ed1  
    5050
    5151*/
    52 fmat_t * new_fmat(uint_t length, uint_t height);
     52fmat_t * new_fmat(uint_t height, uint_t length);
    5353
    5454/** fmat_t buffer deletion function
  • src/io/audio_unit.c

    r1ece4f8 r4ed0ed1  
    105105
    106106  /* the floats coming from and to the device callback */
    107   o->output_frames = new_fmat(blocksize, sw_output_channels);
    108   o->input_frames = new_fmat(blocksize, sw_input_channels);
     107  o->output_frames = new_fmat(sw_output_channels, blocksize);
     108  o->input_frames = new_fmat(sw_input_channels, blocksize);
    109109
    110110  /* check for some sizes */
  • src/spectral/filterbank.c

    r1ece4f8 r4ed0ed1  
    4444
    4545  /* allocate filter tables, a matrix of length win_s and of height n_filters */
    46   fb->filters = new_fmat (win_s / 2 + 1, n_filters);
     46  fb->filters = new_fmat (n_filters, win_s / 2 + 1);
    4747
    4848  return fb;
  • src/spectral/mfcc.c

    r1ece4f8 r4ed0ed1  
    6767  mfcc->in_dct = new_fvec (n_filters);
    6868
    69   mfcc->dct_coeffs = new_fmat (n_coefs, n_filters);
     69  mfcc->dct_coeffs = new_fmat (n_filters, n_coefs);
    7070
    7171  /* compute DCT transform dct_coeffs[i][j] as
  • src/synth/sampler.c

    r1ece4f8 r4ed0ed1  
    4343  s->blocksize = blocksize;
    4444  s->source_output = new_fvec(blocksize);
    45   s->source_output_multi = new_fmat(blocksize, 4);
     45  s->source_output_multi = new_fmat(4, blocksize);
    4646  s->source = NULL;
    4747  s->playing = 0;
  • tests/src/io/test-source_multi.c

    r1ece4f8 r4ed0ed1  
    3939  if ( n_channels == 0 ) n_channels = aubio_source_get_channels(s);
    4040
    41   fmat_t *mat = new_fmat(hop_size, n_channels);
     41  fmat_t *mat = new_fmat(n_channels, hop_size);
    4242
    4343  do {
  • tests/src/test-fmat.c

    r1ece4f8 r4ed0ed1  
    99  uint_t height = 3, length = 9, i, j;
    1010  // create fmat_t object
    11   fmat_t * mat = new_fmat (length, height);
     11  fmat_t * mat = new_fmat (height, length);
    1212  for ( i = 0; i < mat->height; i++ ) {
    1313    for ( j = 0; j < mat->length; j++ ) {
Note: See TracChangeset for help on using the changeset viewer.