annotate dsp/segmentation/cluster_segmenter.h @ 321:f1e6be2de9a5

A threshold (delta) is added in the peak picking parameters structure (PPickParams). It is used as an offset when computing the smoothed detection function. A constructor for the structure PPickParams is also added to set the parameters to 0 when a structure instance is created. Hence programmes using the peak picking parameter structure and which do not set the delta parameter (e.g. QM Vamp note onset detector) won't be affected by the modifications. Functions modified: - dsp/onsets/PeakPicking.cpp - dsp/onsets/PeakPicking.h - dsp/signalconditioning/DFProcess.cpp - dsp/signalconditioning/DFProcess.h
author mathieub <mathieu.barthet@eecs.qmul.ac.uk>
date Mon, 20 Jun 2011 19:01:48 +0100
parents d5014ab8b0e5
children 175e51ae78eb
rev   line source
c@243 1 #ifndef _CLUSTER_SEGMENTER_H
c@243 2 #define _CLUSTER_SEGMENTER_H
c@243 3
c@243 4 /*
c@243 5 * cluster_segmenter.h
c@243 6 * soundbite
c@243 7 *
c@243 8 * Created by Mark Levy on 06/04/2006.
c@309 9 * Copyright 2006 Centre for Digital Music, Queen Mary, University of London.
c@309 10
c@309 11 This program is free software; you can redistribute it and/or
c@309 12 modify it under the terms of the GNU General Public License as
c@309 13 published by the Free Software Foundation; either version 2 of the
c@309 14 License, or (at your option) any later version. See the file
c@309 15 COPYING included with this distribution for more information.
c@243 16 *
c@243 17 */
c@243 18
c@243 19 #include <stdio.h>
c@243 20 #include <stdlib.h>
c@243 21 #include <math.h>
c@243 22 #include <float.h>
c@243 23
c@243 24 #include "segment.h"
c@243 25 #include "cluster_melt.h"
c@245 26 #include "hmm/hmm.h"
c@245 27 #include "maths/pca/pca.h"
c@245 28
c@245 29 #ifdef __cplusplus
c@245 30 extern "C" {
c@245 31 #endif
c@243 32
c@243 33 /* applies MPEG-7 normalisation to constant-Q features, storing normalised envelope (norm) in last feature dimension */
c@243 34 void mpeg7_constq(double** features, int nframes, int ncoeff);
c@243 35
c@243 36 /* converts constant-Q features to normalised chroma */
c@243 37 void cq2chroma(double** cq, int nframes, int ncoeff, int bins, double** chroma);
c@243 38
c@243 39 void create_histograms(int* x, int nx, int m, int hlen, double* h);
c@243 40
c@243 41 void cluster_segment(int* q, double** features, int frames_read, int feature_length, int nHMM_states,
c@243 42 int histogram_length, int nclusters, int neighbour_limit);
c@243 43
c@243 44 void constq_segment(int* q, double** features, int frames_read, int bins, int ncoeff, int feature_type,
c@243 45 int nHMM_states, int histogram_length, int nclusters, int neighbour_limit);
c@243 46
c@245 47 #ifdef __cplusplus
c@245 48 }
c@245 49 #endif
c@243 50
c@245 51 #endif