Better structure
This commit is contained in:
1 parent
6ad9f6a1ef
commit
4c597cb4f8
15 files changed
+54
-44
No files matched your search
@@ -0,0 +1,131 @@
|
||||
#pragma once
|
||||
|
||||
#include <complex>
|
||||
#include <vector>
|
||||
#include <list>
|
||||
#include <algorithm>
|
||||
#include <cmath>
|
||||
#include "../compatibility.h"
|
||||
|
||||
/// struct to represent tones
|
||||
struct Tone {
|
||||
static const std::size_t MAXHARM = 48; ///< The maximum number of harmonics tracked
|
||||
static const std::size_t MINAGE = 2; ///< The minimum age required for a tone to be output
|
||||
double freq; ///< Frequency (Hz)
|
||||
double db; ///< Level (dB)
|
||||
double stabledb; ///< Stable level, useful for graphics rendering
|
||||
double harmonics[MAXHARM]; ///< Harmonics' levels
|
||||
std::size_t age; ///< How many times the tone has been detected in row
|
||||
Tone();
|
||||
void print() const; ///< Prints Tone to std::cout
|
||||
bool operator==(double f) const; ///< Compare for rough frequency match
|
||||
/// Less-than compare by levels (instead of frequencies like operator< does)
|
||||
static bool dbCompare(Tone const& l, Tone const& r) { return l.db < r.db; }
|
||||
};
|
||||
|
||||
static inline bool operator==(Tone const& lhs, Tone const& rhs) { return lhs == rhs.freq; }
|
||||
static inline bool operator!=(Tone const& lhs, Tone const& rhs) { return !(lhs == rhs); }
|
||||
static inline bool operator<=(Tone const& lhs, Tone const& rhs) { return lhs.freq < rhs.freq || lhs == rhs; }
|
||||
static inline bool operator>=(Tone const& lhs, Tone const& rhs) { return lhs.freq > rhs.freq || lhs == rhs; }
|
||||
static inline bool operator<(Tone const& lhs, Tone const& rhs) { return lhs.freq < rhs.freq && lhs != rhs; }
|
||||
static inline bool operator>(Tone const& lhs, Tone const& rhs) { return lhs.freq > rhs.freq && lhs != rhs; }
|
||||
|
||||
static const unsigned FFT_P = 10;
|
||||
static const std::size_t FFT_N = 1 << FFT_P;
|
||||
|
||||
/// Lock-free ring buffer. Discards oldest data on overflow (not strictly thread-safe).
|
||||
template <size_t SIZE> class RingBuffer {
|
||||
public:
|
||||
constexpr static size_t capacity = SIZE;
|
||||
RingBuffer(): m_read(), m_write() {} ///< Initialize empty buffer
|
||||
template <typename InIt> void insert(InIt begin, InIt end) {
|
||||
size_t r = m_read; // The read position
|
||||
size_t w = m_write; // The write position
|
||||
bool overflow = (static_cast<size_t>(end - begin) >= SIZE - size());
|
||||
while (begin != end) {
|
||||
m_buf[w] = *begin++; // Copy sample
|
||||
w = modulo(w + 1); // Update cursor
|
||||
}
|
||||
m_write = w;
|
||||
if (overflow) m_read = modulo(w + 1); // Reset read pointer on overflow
|
||||
}
|
||||
/// Read data from current position if there is enough data to fill the range (otherwise return false). Does not move read pointer.
|
||||
template <typename OutIt> bool read(OutIt begin, OutIt end) {
|
||||
size_t r = m_read;
|
||||
if (size() < static_cast<size_t>(end - begin)) return false; // Not enough audio available
|
||||
while (begin != end) *begin++ = m_buf[r++ % SIZE]; // Copy audio to output iterator
|
||||
return true;
|
||||
}
|
||||
void pop(size_t n) { m_read = modulo(m_read + n); } ///< Move reading pointer forward.
|
||||
size_t size() const { return modulo(m_write - m_read); }
|
||||
private:
|
||||
static size_t modulo(size_t idx) { return idx % SIZE; } ///< Modulo operation with proper rounding (handles slightly "negative" idx as well)
|
||||
float m_buf[SIZE];
|
||||
volatile size_t m_read, m_write; ///< The indices of the next read/write operations. read == write implies that buffer is empty.
|
||||
};
|
||||
|
||||
/// analyzer class
|
||||
/** class to analyze input audio and transform it into useable data
|
||||
*/
|
||||
class Analyzer {
|
||||
public:
|
||||
/// fast fourier transform vector
|
||||
typedef std::vector<std::complex<float> > fft_t;
|
||||
/// list of tones
|
||||
typedef std::list<Tone> tones_t;
|
||||
/// constructor
|
||||
Analyzer(double rate, std::string id, unsigned step = 200);
|
||||
/** Add input data to buffer. This is thread-safe (against other functions). **/
|
||||
template <typename InIt> void input(InIt begin, InIt end) {
|
||||
m_buf.insert(begin, end);
|
||||
m_passthrough.insert(begin, end);
|
||||
}
|
||||
/** Call this to process all data input so far. **/
|
||||
void process();
|
||||
/** Get the raw FFT. **/
|
||||
fft_t const& getFFT() const { return m_fft; }
|
||||
/** Get the peak level in dB (negative value, 0.0 = clipping). **/
|
||||
double getPeak() const { return 10.0 * log10(m_peak); }
|
||||
/** Get a list of all tones detected. **/
|
||||
tones_t const& getTones() const { return m_tones; }
|
||||
/** Find a tone within the singing range; prefers strong tones around 200-400 Hz. **/
|
||||
Tone const* findTone(double minfreq = 65.0, double maxfreq = 1000.0) const {
|
||||
if (m_tones.empty()) { m_oldfreq = 0.0; return NULL; }
|
||||
double db = std::max_element(m_tones.begin(), m_tones.end(), Tone::dbCompare)->db;
|
||||
Tone const* best = NULL;
|
||||
double bestscore = 0;
|
||||
for (tones_t::const_iterator it = m_tones.begin(); it != m_tones.end(); ++it) {
|
||||
if (it->db < db - 20.0 || it->freq < minfreq || it->age < Tone::MINAGE) continue;
|
||||
if (it->freq > maxfreq) break;
|
||||
double score = it->db - std::max(180.0, std::abs(it->freq - 300.0)) / 10.0;
|
||||
if (m_oldfreq != 0.0 && std::fabs(it->freq/m_oldfreq - 1.0) < 0.05) score += 10.0;
|
||||
if (best && bestscore > score) break;
|
||||
best = &*it;
|
||||
bestscore = score;
|
||||
}
|
||||
m_oldfreq = (best ? best->freq : 0.0);
|
||||
return best;
|
||||
}
|
||||
/** Give data away for mic pass-through */
|
||||
bool output(float* begin, float* end, double rate);
|
||||
/** Returns the id (color name) of the mic */
|
||||
std::string const& getId() const { return m_id; }
|
||||
|
||||
private:
|
||||
const unsigned m_step;
|
||||
RingBuffer<4 * FFT_N> m_buf; // Twice the FFT size should give enough room for sliding window and for engine delays
|
||||
RingBuffer<4096> m_passthrough;
|
||||
double m_resampleFactor;
|
||||
double m_resamplePos;
|
||||
double m_rate;
|
||||
std::string m_id;
|
||||
std::vector<float> m_window;
|
||||
fft_t m_fft;
|
||||
std::vector<float> m_fftLastPhase;
|
||||
double m_peak;
|
||||
tones_t m_tones;
|
||||
mutable double m_oldfreq;
|
||||
bool calcFFT();
|
||||
void calcTones();
|
||||
void mergeWithOld(tones_t& tones) const;
|
||||
};
|
||||
Reference in new issue
Block a user