Mercurial > hg > qm-dsp
view thread/Thread.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 | b97f4f926f48 |
children | 5f88f517b637 |
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 Chris Cannam, used with permission. */ #ifndef _THREAD_H_ #define _THREAD_H_ #ifdef _WIN32 #include <windows.h> #else /* !_WIN32 */ #ifdef USE_PTHREADS #include <pthread.h> #endif /* USE_PTHREADS */ #endif /* !_WIN32 */ #include <string> //#define DEBUG_THREAD 1 //#define DEBUG_MUTEX 1 //#define DEBUG_CONDITION 1 class Thread { public: #ifdef _WIN32 typedef HANDLE Id; #else #ifdef USE_PTHREADS typedef pthread_t Id; #endif #endif Thread(); virtual ~Thread(); Id id(); void start(); void wait(); static bool threadingAvailable(); protected: virtual void run() = 0; private: #ifdef _WIN32 HANDLE m_id; bool m_extant; static DWORD WINAPI staticRun(LPVOID lpParam); #else #ifdef USE_PTHREADS pthread_t m_id; bool m_extant; static void *staticRun(void *); #endif #endif }; class Mutex { public: Mutex(); ~Mutex(); void lock(); void unlock(); bool trylock(); private: #ifdef _WIN32 HANDLE m_mutex; #ifndef NO_THREAD_CHECKS DWORD m_lockedBy; #endif #else #ifdef USE_PTHREADS pthread_mutex_t m_mutex; #ifndef NO_THREAD_CHECKS pthread_t m_lockedBy; bool m_locked; #endif #endif #endif }; class MutexLocker { public: MutexLocker(Mutex *); ~MutexLocker(); private: Mutex *m_mutex; }; class Condition { public: Condition(std::string name); ~Condition(); // Condition bundles a pthread-style condition variable and mutex // into one class. // To wait on a condition, call lock(), test termination variables // as appropriate, and then wait(). The condition will be // unlocked for the duration of the wait() call, which will end // when the condition is signalled. The condition will be locked // again when wait() returns. // // To signal a condition, call signal(). If the waiting thread // will be performing tests between its own lock() and wait(), // then the signalling thread should also lock() before it signals // (and then unlock afterwards). If the signalling thread always // locks the mutex during signalling, then the waiting thread // knows that signals will only happen during wait() and not be // missed at other times. void lock(); void unlock(); void wait(int us = 0); void signal(); private: #ifdef _WIN32 HANDLE m_mutex; HANDLE m_condition; bool m_locked; #else #ifdef USE_PTHREADS pthread_mutex_t m_mutex; pthread_cond_t m_condition; bool m_locked; #endif #endif #ifdef DEBUG_CONDITION std::string m_name; #endif }; #endif