Mercurial > hg > qm-dsp
view dsp/segmentation/cluster_segmenter.h @ 298:255e431ae3d4
* Key detector: when returning key strengths, use the peak value of the
three underlying chromagram correlations (from 36-bin chromagram)
corresponding to each key, instead of the mean.
Rationale: This is the same method as used when returning the key value,
and it's nice to have the same results in both returned value and plot.
The peak performed better than the sum with a simple test set of triads,
so it seems reasonable to change the plot to match the key output rather
than the other way around.
* FFT: kiss_fftr returns only the non-conjugate bins, synthesise the rest
rather than leaving them (perhaps dangerously) undefined. Fixes an
uninitialised data error in chromagram that could cause garbage results
from key detector.
* Constant Q: remove precalculated values again, I reckon they're not
proving such a good tradeoff.
author | Chris Cannam <c.cannam@qmul.ac.uk> |
---|---|
date | Fri, 05 Jun 2009 15:12:39 +0000 |
parents | cdfd0948a852 |
children | e5907ae6de17 |
line wrap: on
line source
#ifndef _CLUSTER_SEGMENTER_H #define _CLUSTER_SEGMENTER_H /* * cluster_segmenter.h * soundbite * * Created by Mark Levy on 06/04/2006. * Copyright 2006 Centre for Digital Music, Queen Mary, University of London. All rights reserved. * */ #include <stdio.h> #include <stdlib.h> #include <math.h> #include <float.h> #include "segment.h" #include "cluster_melt.h" #include "hmm/hmm.h" #include "maths/pca/pca.h" #ifdef __cplusplus extern "C" { #endif /* applies MPEG-7 normalisation to constant-Q features, storing normalised envelope (norm) in last feature dimension */ void mpeg7_constq(double** features, int nframes, int ncoeff); /* converts constant-Q features to normalised chroma */ void cq2chroma(double** cq, int nframes, int ncoeff, int bins, double** chroma); void create_histograms(int* x, int nx, int m, int hlen, double* h); void cluster_segment(int* q, double** features, int frames_read, int feature_length, int nHMM_states, int histogram_length, int nclusters, int neighbour_limit); void constq_segment(int* q, double** features, int frames_read, int bins, int ncoeff, int feature_type, int nHMM_states, int histogram_length, int nclusters, int neighbour_limit); #ifdef __cplusplus } #endif #endif