view dsp/signalconditioning/Framer.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 49844bc8a895
children e5907ae6de17
line wrap: on
line source
/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */

/*
    QM DSP Library

    Centre for Digital Music, Queen Mary, University of London.
    This file copyright 2005-2006 Christian Landone.
    All rights reserved.
*/

#ifndef FRAMER_H
#define FRAMER_H

//#include <io.h>
#include <fcntl.h>
#include <stdio.h>


class Framer  
{
public:
    void setSource( double* src, unsigned int length );
    unsigned int getMaxNoFrames();
    void getFrame( double* dst );
    void configure( unsigned int frameLength, unsigned int hop );
    Framer();
    virtual ~Framer();

    void resetCounters();

private:

    unsigned long	m_ulSampleLen;		// DataLength (samples)
    unsigned int	m_framesRead;		// Read Frames Index

    double*			m_srcBuffer;
    double*			m_dataFrame;		// Analysis Frame Buffer
    double*			m_strideFrame;		// Stride Frame Buffer
    unsigned int	m_frameLength;		// Analysis Frame Length
    unsigned int	m_stepSize;		// Analysis Frame Stride

    unsigned int	m_maxFrames;

    unsigned long	m_ulSrcIndex;
};

#endif