Spectrum analyzer update (#5160)
* advanced config: expose hidden constants to user screen * advanced config: add support for FFT window overlapping * waterfall: display at native resolution on high-DPI screens * waterfall: add cursor and improve label density * FFT: fix normalization so that 0 dBFS matches full-scale sinewave * FFT: decouple data acquisition from processing and display * FFT: separate lock for reallocation (to avoid some needless waiting) * moved ranges and other constants to a separate file * debug: better performance measurements * minor fixes * build the ringbuffer library as part of LMMS core
This commit is contained in:
committed by
Johannes Lorenz
parent
2f0010270e
commit
da73ddd242
132
include/LocklessRingBuffer.h
Normal file
132
include/LocklessRingBuffer.h
Normal file
@@ -0,0 +1,132 @@
|
||||
/*
|
||||
* LocklessRingBuffer.h - LMMS wrapper for a lockless ringbuffer library
|
||||
*
|
||||
* Copyright (c) 2019 Martin Pavelek <he29/dot/HS/at/gmail/dot/com>
|
||||
*
|
||||
* This file is part of LMMS - https://lmms.io
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public
|
||||
* License as published by the Free Software Foundation; either
|
||||
* version 2 of the License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public
|
||||
* License along with this program (see COPYING); if not, write to the
|
||||
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
||||
* Boston, MA 02110-1301 USA.
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef LOCKLESSRINGBUFFER_H
|
||||
#define LOCKLESSRINGBUFFER_H
|
||||
|
||||
#include <QMutex>
|
||||
#include <QWaitCondition>
|
||||
|
||||
#include "lmms_basics.h"
|
||||
#include "lmms_export.h"
|
||||
#include "../src/3rdparty/ringbuffer/include/ringbuffer/ringbuffer.h"
|
||||
|
||||
|
||||
//! A convenience layer for a realtime-safe and thread-safe multi-reader ring buffer library.
|
||||
template <class T>
|
||||
class LocklessRingBufferBase
|
||||
{
|
||||
template<class _T>
|
||||
friend class LocklessRingBufferReader;
|
||||
public:
|
||||
LocklessRingBufferBase(std::size_t sz) : m_buffer(sz)
|
||||
{
|
||||
m_buffer.touch(); // reserve storage space before realtime operation starts
|
||||
}
|
||||
~LocklessRingBufferBase() {};
|
||||
|
||||
std::size_t capacity() const {return m_buffer.maximum_eventual_write_space();}
|
||||
std::size_t free() const {return m_buffer.write_space();}
|
||||
void wakeAll() {m_notifier.wakeAll();}
|
||||
|
||||
protected:
|
||||
ringbuffer_t<T> m_buffer;
|
||||
QWaitCondition m_notifier;
|
||||
};
|
||||
|
||||
|
||||
// The SampleFrameCopier is required because sampleFrame is just a two-element
|
||||
// array and therefore does not have a copy constructor needed by std::copy.
|
||||
class SampleFrameCopier
|
||||
{
|
||||
const sampleFrame* m_src;
|
||||
public:
|
||||
SampleFrameCopier(const sampleFrame* src) : m_src(src) {}
|
||||
void operator()(std::size_t src_offset, std::size_t count, sampleFrame* dest)
|
||||
{
|
||||
for (std::size_t i = src_offset; i < src_offset + count; i++, dest++)
|
||||
{
|
||||
(*dest)[0] = m_src[i][0];
|
||||
(*dest)[1] = m_src[i][1];
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
//! Standard ring buffer template for data types with copy constructor.
|
||||
template <class T>
|
||||
class LocklessRingBuffer : public LocklessRingBufferBase<T>
|
||||
{
|
||||
public:
|
||||
LocklessRingBuffer(std::size_t sz) : LocklessRingBufferBase<T>(sz) {};
|
||||
|
||||
std::size_t write(const sampleFrame *src, std::size_t cnt, bool notify = false)
|
||||
{
|
||||
std::size_t written = LocklessRingBufferBase<T>::m_buffer.write(src, cnt);
|
||||
// Let all waiting readers know new data are available.
|
||||
if (notify) {LocklessRingBufferBase<T>::m_notifier.wakeAll();}
|
||||
return written;
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
//! Specialized ring buffer template with write function modified to support sampleFrame.
|
||||
template <>
|
||||
class LocklessRingBuffer<sampleFrame> : public LocklessRingBufferBase<sampleFrame>
|
||||
{
|
||||
public:
|
||||
LocklessRingBuffer(std::size_t sz) : LocklessRingBufferBase<sampleFrame>(sz) {};
|
||||
|
||||
std::size_t write(const sampleFrame *src, std::size_t cnt, bool notify = false)
|
||||
{
|
||||
SampleFrameCopier copier(src);
|
||||
std::size_t written = LocklessRingBufferBase<sampleFrame>::m_buffer.write_func<SampleFrameCopier>(copier, cnt);
|
||||
// Let all waiting readers know new data are available.
|
||||
if (notify) {LocklessRingBufferBase<sampleFrame>::m_notifier.wakeAll();}
|
||||
return written;
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
//! Wrapper for lockless ringbuffer reader
|
||||
template <class T>
|
||||
class LocklessRingBufferReader : public ringbuffer_reader_t<T>
|
||||
{
|
||||
public:
|
||||
LocklessRingBufferReader(LocklessRingBuffer<T> &rb) :
|
||||
ringbuffer_reader_t<T>(rb.m_buffer),
|
||||
m_notifier(&rb.m_notifier) {};
|
||||
|
||||
bool empty() const {return !this->read_space();}
|
||||
void waitForData()
|
||||
{
|
||||
QMutex useless_lock;
|
||||
m_notifier->wait(&useless_lock);
|
||||
useless_lock.unlock();
|
||||
}
|
||||
private:
|
||||
QWaitCondition *m_notifier;
|
||||
};
|
||||
|
||||
#endif //LOCKLESSRINGBUFFER_H
|
||||
@@ -32,6 +32,8 @@
|
||||
#include "lmms_math.h"
|
||||
#include "MemoryManager.h"
|
||||
|
||||
/** \brief A basic LMMS ring buffer for single-thread use. For thread and realtime safe alternative see LocklessRingBuffer.
|
||||
*/
|
||||
class LMMS_EXPORT RingBuffer : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
@@ -49,4 +49,47 @@ const float F_PI_SQR = (float) LD_PI_SQR;
|
||||
const float F_E = (float) LD_E;
|
||||
const float F_E_R = (float) LD_E_R;
|
||||
|
||||
// Frequency ranges (in Hz).
|
||||
// Arbitrary low limit for logarithmic frequency scale; >1 Hz.
|
||||
const int LOWEST_LOG_FREQ = 10;
|
||||
|
||||
// Full range is defined by LOWEST_LOG_FREQ and current sample rate.
|
||||
enum FREQUENCY_RANGES
|
||||
{
|
||||
FRANGE_FULL = 0,
|
||||
FRANGE_AUDIBLE,
|
||||
FRANGE_BASS,
|
||||
FRANGE_MIDS,
|
||||
FRANGE_HIGH
|
||||
};
|
||||
|
||||
const int FRANGE_AUDIBLE_START = 20;
|
||||
const int FRANGE_AUDIBLE_END = 20000;
|
||||
const int FRANGE_BASS_START = 20;
|
||||
const int FRANGE_BASS_END = 300;
|
||||
const int FRANGE_MIDS_START = 200;
|
||||
const int FRANGE_MIDS_END = 5000;
|
||||
const int FRANGE_HIGH_START = 4000;
|
||||
const int FRANGE_HIGH_END = 20000;
|
||||
|
||||
// Amplitude ranges (in dBFS).
|
||||
// Reference: full scale sine wave (-1.0 to 1.0) is 0 dB.
|
||||
// Doubling or halving the amplitude produces 3 dB difference.
|
||||
enum AMPLITUDE_RANGES
|
||||
{
|
||||
ARANGE_EXTENDED = 0,
|
||||
ARANGE_AUDIBLE,
|
||||
ARANGE_LOUD,
|
||||
ARANGE_SILENT
|
||||
};
|
||||
|
||||
const int ARANGE_EXTENDED_START = -80;
|
||||
const int ARANGE_EXTENDED_END = 20;
|
||||
const int ARANGE_AUDIBLE_START = -50;
|
||||
const int ARANGE_AUDIBLE_END = 0;
|
||||
const int ARANGE_LOUD_START = -30;
|
||||
const int ARANGE_LOUD_END = 0;
|
||||
const int ARANGE_SILENT_START = -60;
|
||||
const int ARANGE_SILENT_END = -10;
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user