Changeset 4ed0ed1 for src

Timestamp:

Dec 17, 2013, 5:30:13 PM (11 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

Location:

src

Files:

• fmat.c (modified) (1 diff)
• fmat.h (modified) (1 diff)
• io/audio_unit.c (modified) (1 diff)
• spectral/filterbank.c (modified) (1 diff)
• spectral/mfcc.c (modified) (1 diff)
• synth/sampler.c (modified) (1 diff)

src/fmat.c

@@ -22 +22 @@
 #include "fmat.h"
 
-fmat_t * new_fmat (uint_t length, uint_t height) {
+fmat_t * new_fmat (uint_t height, uint_t length) {
   if ((sint_t)length <= 0 || (sint_t)height <= 0 ) {
     return NULL;

src/fmat.h

@@ -50 +50 @@
 
 */
-fmat_t * new_fmat(uint_t length, uint_t height);
+fmat_t * new_fmat(uint_t height, uint_t length);
 
 /** fmat_t buffer deletion function

src/io/audio_unit.c

@@ -105 +105 @@
 
   /* the floats coming from and to the device callback */
-  o->output_frames = new_fmat(blocksize, sw_output_channels);
-  o->input_frames = new_fmat(blocksize, sw_input_channels);
+  o->output_frames = new_fmat(sw_output_channels, blocksize);
+  o->input_frames = new_fmat(sw_input_channels, blocksize);
 
   /* check for some sizes */

src/spectral/filterbank.c

@@ -44 +44 @@
 
   /* allocate filter tables, a matrix of length win_s and of height n_filters */
-  fb->filters = new_fmat (win_s / 2 + 1, n_filters);
+  fb->filters = new_fmat (n_filters, win_s / 2 + 1);
 
   return fb;

src/spectral/mfcc.c

@@ -67 +67 @@
   mfcc->in_dct = new_fvec (n_filters);
 
-  mfcc->dct_coeffs = new_fmat (n_coefs, n_filters);
+  mfcc->dct_coeffs = new_fmat (n_filters, n_coefs);
 
   /* compute DCT transform dct_coeffs[i][j] as

src/synth/sampler.c

@@ -43 +43 @@
   s->blocksize = blocksize;
   s->source_output = new_fvec(blocksize);
-  s->source_output_multi = new_fmat(blocksize, 4);
+  s->source_output_multi = new_fmat(4, blocksize);
   s->source = NULL;
   s->playing = 0;