aboutsummaryrefslogtreecommitdiff
path: root/src/scalar.c
diff options
context:
space:
mode:
authorJamie Bullock <jamie@postlude.co.uk>2008-02-16 20:13:05 +0000
committerJamie Bullock <jamie@postlude.co.uk>2008-02-16 20:13:05 +0000
commit398afce1d37bad97d50a20aa5406a4dc6327912d (patch)
tree6b4bbeeaadc14e1e4ef3567565aae7023a6c2161 /src/scalar.c
parent26fa6beab516a699ead017f4a2d68b1d861b9561 (diff)
downloadLibXtract-398afce1d37bad97d50a20aa5406a4dc6327912d.tar.gz
LibXtract-398afce1d37bad97d50a20aa5406a4dc6327912d.tar.bz2
LibXtract-398afce1d37bad97d50a20aa5406a4dc6327912d.zip
- Added to pd example the ability to differentiate between different
argv types (XTRACT_FLOAT, XTRACT_INT) and pass the correct data type to the xtract[]() function - Added xtract_flatness_db() details to descriptors.c - Fixes to tonality and xtract_subbands descriptors - Added Pd examples for 'subband mean' and tonality calculated using subbands
Diffstat (limited to 'src/scalar.c')
-rw-r--r--src/scalar.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/scalar.c b/src/scalar.c
index b2fa868..4a2b672 100644
--- a/src/scalar.c
+++ b/src/scalar.c
@@ -535,14 +535,14 @@ int xtract_flatness(const float *data, const int N, const void *argv, float *res
int xtract_flatness_db(const float *data, const int N, const void *argv, float *result){
- float flatness_db;
+ float flatness;
- flatness_db = *(float *)argv;
+ flatness = *(float *)argv;
- if (flatness_db <= 0)
- flatness_db = XTRACT_LOG_LIMIT;
+ if (flatness <= 0)
+ flatness = XTRACT_LOG_LIMIT;
- *result = 10 * log10f(flatness_db);
+ *result = 10 * log10f(flatness);
return XTRACT_SUCCESS;