Changeset dddf1f5 for src/spectral

Timestamp:

Nov 29, 2007, 5:34:18 PM (17 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:

212da72

Parents:

66a1b955 (diff), 6c7d49b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge with main branch

Location:

src/spectral

Files:

• fft.c (moved) (moved from src/fft.c) (1 diff)
• fft.h (moved) (moved from src/fft.h)
• filterbank.c (added)
• filterbank.h (added)
• mfcc.c (added)
• mfcc.h (added)
• phasevoc.c (moved) (moved from src/phasevoc.c) (1 diff)
• phasevoc.h (moved) (moved from src/phasevoc.h)
• spectral_centroid.c (added)
• spectral_centroid.h (moved) (moved from src/sample.h) (2 diffs)
• tss.c (moved) (moved from src/tss.c) (1 diff)
• tss.h (moved) (moved from src/tss.h)

src/spectral/fft.c ¶

@@ -22 +22 @@
 #include "cvec.h"
 #include "mathutils.h"
-#include "fft.h"
+#include "spectral/fft.h"
 
 #if FFTW3F_SUPPORT

src/spectral/phasevoc.c ¶

@@ -21 +21 @@
 #include "fvec.h"
 #include "cvec.h"
-#include "fft.h"
 #include "mathutils.h"
-#include "phasevoc.h"
+#include "spectral/fft.h"
+#include "spectral/phasevoc.h"
 
 /** phasevocoder internal object */

src/spectral/spectral_centroid.h ¶

@@ -1 +1 @@
 /*
-   Copyright (C) 2003-2007 Paul Brossier <piem@piem.org>
+   Copyright (C) 2007 Paul Brossier
 
    This program is free software; you can redistribute it and/or modify
@@ -18 +18 @@
 */
 
-#ifndef _SAMPLE_H
-#define _SAMPLE_H
+/** @file
+ * compute spectrum centroid of a cvec object
+ */
 
-#include "fvec.h"
-#include "cvec.h"
-
-#endif /* _SAMPLE_H */
+/**
+ * spectrum centroid computed on a cvec
+ */
+smpl_t aubio_spectral_centroid(cvec_t * input, smpl_t samplerate);

src/spectral/tss.c ¶

@@ -21 +21 @@
 
 #include "aubio_priv.h"
-#include "sample.h"
+#include "fvec.h"
+#include "cvec.h"
 #include "mathutils.h"
-#include "tss.h"
+#include "spectral/tss.h"
 
 struct _aubio_tss_t