Mercurial > hg > svcore
view data/model/ReadOnlyWaveFileModel.h @ 1196:c7b9c902642f spectrogram-minor-refactor
Fix threshold in spectrogram -- it wasn't working in the last release.
There is a new protocol for this. Formerly the threshold parameter had a
range from -50dB to 0 with the default at -50, and -50 treated internally
as "no threshold". However, there was a hardcoded, hidden internal threshold
for spectrogram colour mapping at -80dB with anything below this being rounded
to zero. Now the threshold parameter has range -81 to -1 with the default
at -80, -81 is treated internally as "no threshold", and there is no hidden
internal threshold. So the default behaviour is the same as before, an
effective -80dB threshold, but it is now possible to change this in both
directions. Sessions reloaded from prior versions may look slightly different
because, if the session says there should be no threshold, there will now
actually be no threshold instead of having the hidden internal one.
Still need to do something in the UI to make it apparent that the -81dB
setting removes the threshold entirely. This is at least no worse than the
previous, also obscured, magic -50dB setting.
author | Chris Cannam |
---|---|
date | Mon, 01 Aug 2016 16:21:01 +0100 |
parents | efea94b04d5a |
children | 54af1e21705c |
line wrap: on
line source
/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */ /* Sonic Visualiser An audio file viewer and annotation editor. Centre for Digital Music, Queen Mary, University of London. This file copyright 2006 Chris Cannam and QMUL. 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. See the file COPYING included with this distribution for more information. */ #ifndef READ_ONLY_WAVE_FILE_MODEL_H #define READ_ONLY_WAVE_FILE_MODEL_H #include "WaveFileModel.h" #include "base/Thread.h" #include <QMutex> #include <QTimer> #include "data/fileio/FileSource.h" #include "RangeSummarisableTimeValueModel.h" #include "PowerOfSqrtTwoZoomConstraint.h" #include <stdlib.h> class AudioFileReader; class ReadOnlyWaveFileModel : public WaveFileModel { Q_OBJECT public: ReadOnlyWaveFileModel(FileSource source, sv_samplerate_t targetRate = 0); ReadOnlyWaveFileModel(FileSource source, AudioFileReader *reader); ~ReadOnlyWaveFileModel(); bool isOK() const; bool isReady(int *) const; const ZoomConstraint *getZoomConstraint() const { return &m_zoomConstraint; } sv_frame_t getFrameCount() const; int getChannelCount() const; sv_samplerate_t getSampleRate() const; sv_samplerate_t getNativeRate() const; QString getTitle() const; QString getMaker() const; QString getLocation() const; QString getLocalFilename() const; float getValueMinimum() const { return -1.0f; } float getValueMaximum() const { return 1.0f; } virtual sv_frame_t getStartFrame() const { return m_startFrame; } virtual sv_frame_t getEndFrame() const { return m_startFrame + getFrameCount(); } void setStartFrame(sv_frame_t startFrame) { m_startFrame = startFrame; } virtual std::vector<float> getData(int channel, sv_frame_t start, sv_frame_t count) const; virtual std::vector<std::vector<float>> getMultiChannelData(int fromchannel, int tochannel, sv_frame_t start, sv_frame_t count) const; virtual int getSummaryBlockSize(int desired) const; virtual void getSummaries(int channel, sv_frame_t start, sv_frame_t count, RangeBlock &ranges, int &blockSize) const; virtual Range getSummary(int channel, sv_frame_t start, sv_frame_t count) const; QString getTypeName() const { return tr("Wave File"); } virtual void toXml(QTextStream &out, QString indent = "", QString extraAttributes = "") const; protected slots: void fillTimerTimedOut(); void cacheFilled(); protected: void initialize(); class RangeCacheFillThread : public Thread { public: RangeCacheFillThread(ReadOnlyWaveFileModel &model) : m_model(model), m_fillExtent(0), m_frameCount(model.getFrameCount()) { } sv_frame_t getFillExtent() const { return m_fillExtent; } virtual void run(); protected: ReadOnlyWaveFileModel &m_model; sv_frame_t m_fillExtent; sv_frame_t m_frameCount; }; void fillCache(); FileSource m_source; QString m_path; AudioFileReader *m_reader; bool m_myReader; sv_frame_t m_startFrame; RangeBlock m_cache[2]; // interleaved at two base resolutions mutable QMutex m_mutex; RangeCacheFillThread *m_fillThread; QTimer *m_updateTimer; sv_frame_t m_lastFillExtent; bool m_exiting; static PowerOfSqrtTwoZoomConstraint m_zoomConstraint; mutable std::vector<float> m_directRead; mutable sv_frame_t m_lastDirectReadStart; mutable sv_frame_t m_lastDirectReadCount; mutable QMutex m_directReadMutex; }; #endif