Salastil/ncmpcpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix autoscaler

Browse Source
This commit is contained in:
Andrzej Rybczak
2020-12-14 16:46:05 +01:00
parent cff792bb7e
commit b5bea554b6
2 changed files with 42 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/screens/visualizer.cpp
View File

@@ -133,19 +133,10 @@ void Visualizer::update()
// PCM in format 44100:16:1 (for mono visualization) and // PCM in format 44100:16:1 (for mono visualization) and
// 44100:16:2 (for stereo visualization) is supported. // 44100:16:2 (for stereo visualization) is supported.
const int buf_size = sizeof(int16_t)*m_read_samples; const int buf_size = sizeof(int16_t)*m_read_samples;
ssize_t data = read(m_fifo, m_temp_sample_buffer.data(), buf_size); ssize_t bytes_read = read(m_fifo, m_temp_sample_buffer.data(), buf_size);
if (data <= 0) // no data available in fifo if (bytes_read <= 0) // no data available in fifo
return; return;
{
// create int8_t pointers for arithmetic
int8_t *const sdata = (int8_t *)m_sample_buffer.data();
int8_t *const temp_sdata = (int8_t *)m_temp_sample_buffer.data();
int8_t *const sdata_end = sdata + buf_size;
memmove(sdata, sdata + data, buf_size - data);
memcpy(sdata_end - data, temp_sdata, data);
}
if (m_output_id != -1 && Global::Timer - m_timer > Config.visualizer_sync_interval) if (m_output_id != -1 && Global::Timer - m_timer > Config.visualizer_sync_interval)
{ {
Mpd.DisableOutput(m_output_id); Mpd.DisableOutput(m_output_id);
@@ -153,32 +144,43 @@ void Visualizer::update()
Mpd.EnableOutput(m_output_id); Mpd.EnableOutput(m_output_id);
m_timer = Global::Timer; m_timer = Global::Timer;
} }
if (Config.visualizer_autoscale) if (Config.visualizer_autoscale)
{ {
m_auto_scale_multiplier += 1.0/Config.visualizer_fps; m_auto_scale_multiplier += 1.0/Config.visualizer_fps;
for (auto &sample : m_sample_buffer) const auto begin = m_temp_sample_buffer.begin();
const auto end = m_temp_sample_buffer.begin() + bytes_read/sizeof(int16_t);
for (auto sample = begin; sample != end; ++sample)
{ {
double scale = std::numeric_limits<int16_t>::min(); double scale = std::numeric_limits<int16_t>::min();
scale /= sample; scale /= *sample;
scale = fabs(scale); scale = fabs(scale);
if (scale < m_auto_scale_multiplier) if (scale < m_auto_scale_multiplier)
m_auto_scale_multiplier = scale; m_auto_scale_multiplier = scale;
} }
for (auto &sample : m_sample_buffer) for (auto sample = begin; sample != end; ++sample)
{ {
int32_t tmp = sample; int32_t tmp = *sample;
if (m_auto_scale_multiplier <= 50.0) // limit the auto scale if (m_auto_scale_multiplier <= 50.0) // limit the auto scale
tmp *= m_auto_scale_multiplier; tmp *= m_auto_scale_multiplier;
if (tmp < std::numeric_limits<int16_t>::min()) if (tmp < std::numeric_limits<int16_t>::min())
sample = std::numeric_limits<int16_t>::min(); *sample = std::numeric_limits<int16_t>::min();
else if (tmp > std::numeric_limits<int16_t>::max()) else if (tmp > std::numeric_limits<int16_t>::max())
sample = std::numeric_limits<int16_t>::max(); *sample = std::numeric_limits<int16_t>::max();
else else
sample = tmp; *sample = tmp;
} }
} }
{
// create int8_t pointers for arithmetic
int8_t *const sdata = (int8_t *)m_sample_buffer.data();
int8_t *const temp_sdata = (int8_t *)m_temp_sample_buffer.data();
int8_t *const sdata_end = sdata + buf_size;
memmove(sdata, sdata + bytes_read, buf_size - bytes_read);
memcpy(sdata_end - bytes_read, temp_sdata, bytes_read);
}
w.clear(); w.clear();
if (Config.visualizer_in_stereo) if (Config.visualizer_in_stereo)
{ {
@@ -210,7 +212,7 @@ int Visualizer::windowTimeout()
/**********************************************************************/ /**********************************************************************/
void Visualizer::DrawSoundWave(int16_t *buf, ssize_t samples, size_t y_offset, size_t height) void Visualizer::DrawSoundWave(const int16_t *buf, ssize_t samples, size_t y_offset, size_t height)
{ {
const size_t half_height = height/2; const size_t half_height = height/2;
const size_t base_y = y_offset+half_height; const size_t base_y = y_offset+half_height;
@@ -262,7 +264,7 @@ void Visualizer::DrawSoundWave(int16_t *buf, ssize_t samples, size_t y_offset, s
} }
} }
void Visualizer::DrawSoundWaveStereo(int16_t *buf_left, int16_t *buf_right, ssize_t samples, size_t height) void Visualizer::DrawSoundWaveStereo(const int16_t *buf_left, const int16_t *buf_right, ssize_t samples, size_t height)
{ {
DrawSoundWave(buf_left, samples, 0, height); DrawSoundWave(buf_left, samples, 0, height);
DrawSoundWave(buf_right, samples, height, w.getHeight() - height); DrawSoundWave(buf_right, samples, height, w.getHeight() - height);
@@ -274,7 +276,7 @@ void Visualizer::DrawSoundWaveStereo(int16_t *buf_left, int16_t *buf_right, ssiz
// instead of a single line the entire height is filled. In stereo mode, the top // instead of a single line the entire height is filled. In stereo mode, the top
// half of the screen is dedicated to the right channel, the bottom the left // half of the screen is dedicated to the right channel, the bottom the left
// channel. // channel.
void Visualizer::DrawSoundWaveFill(int16_t *buf, ssize_t samples, size_t y_offset, size_t height) void Visualizer::DrawSoundWaveFill(const int16_t *buf, ssize_t samples, size_t y_offset, size_t height)
{ {
// if right channel is drawn, bars descend from the top to the bottom // if right channel is drawn, bars descend from the top to the bottom
const bool flipped = y_offset > 0; const bool flipped = y_offset > 0;
@@ -309,7 +311,7 @@ void Visualizer::DrawSoundWaveFill(int16_t *buf, ssize_t samples, size_t y_offse
} }
} }
void Visualizer::DrawSoundWaveFillStereo(int16_t *buf_left, int16_t *buf_right, ssize_t samples, size_t height) void Visualizer::DrawSoundWaveFillStereo(const int16_t *buf_left, const int16_t *buf_right, ssize_t samples, size_t height)
{ {
DrawSoundWaveFill(buf_left, samples, 0, height); DrawSoundWaveFill(buf_left, samples, 0, height);
DrawSoundWaveFill(buf_right, samples, height, w.getHeight() - height); DrawSoundWaveFill(buf_right, samples, height, w.getHeight() - height);
@@ -318,7 +320,7 @@ void Visualizer::DrawSoundWaveFillStereo(int16_t *buf_left, int16_t *buf_right,
/**********************************************************************/ /**********************************************************************/
// Draws the sound wave as an ellipse with origin in the center of the screen. // Draws the sound wave as an ellipse with origin in the center of the screen.
void Visualizer::DrawSoundEllipse(int16_t *buf, ssize_t samples, size_t, size_t height) void Visualizer::DrawSoundEllipse(const int16_t *buf, ssize_t samples, size_t, size_t height)
{ {
const size_t half_width = w.getWidth()/2; const size_t half_width = w.getWidth()/2;
const size_t half_height = height/2; const size_t half_height = height/2;
@@ -361,7 +363,7 @@ void Visualizer::DrawSoundEllipse(int16_t *buf, ssize_t samples, size_t, size_t
// circle. This visualizer assume the font height is twice the length of the // circle. This visualizer assume the font height is twice the length of the
// font's width. If the font is skinner or wider than this, instead of a circle // font's width. If the font is skinner or wider than this, instead of a circle
// it will be an ellipse. // it will be an ellipse.
void Visualizer::DrawSoundEllipseStereo(int16_t *buf_left, int16_t *buf_right, ssize_t samples, size_t half_height) void Visualizer::DrawSoundEllipseStereo(const int16_t *buf_left, const int16_t *buf_right, ssize_t samples, size_t half_height)
{ {
const size_t width = w.getWidth(); const size_t width = w.getWidth();
const size_t left_half_width = width/2; const size_t left_half_width = width/2;
@@ -393,7 +395,7 @@ void Visualizer::DrawSoundEllipseStereo(int16_t *buf_left, int16_t *buf_right, s
/**********************************************************************/ /**********************************************************************/
#ifdef HAVE_FFTW3_H #ifdef HAVE_FFTW3_H
void Visualizer::DrawFrequencySpectrum(int16_t *buf, ssize_t samples, size_t y_offset, size_t height) void Visualizer::DrawFrequencySpectrum(const int16_t *buf, ssize_t samples, size_t y_offset, size_t height)
{ {
// If right channel is drawn, bars descend from the top to the bottom. // If right channel is drawn, bars descend from the top to the bottom.
const bool flipped = y_offset > 0; const bool flipped = y_offset > 0;
@@ -504,7 +506,7 @@ void Visualizer::DrawFrequencySpectrum(int16_t *buf, ssize_t samples, size_t y_o
} }
} }
void Visualizer::DrawFrequencySpectrumStereo(int16_t *buf_left, int16_t *buf_right, ssize_t samples, size_t height) void Visualizer::DrawFrequencySpectrumStereo(const int16_t *buf_left, const int16_t *buf_right, ssize_t samples, size_t height)
{ {
DrawFrequencySpectrum(buf_left, samples, 0, height); DrawFrequencySpectrum(buf_left, samples, 0, height);
DrawFrequencySpectrum(buf_right, samples, height, w.getHeight() - height); DrawFrequencySpectrum(buf_right, samples, height, w.getHeight() - height);
@@ -555,7 +557,7 @@ double Visualizer::Interpolate(size_t x, size_t h_idx)
return h_next; return h_next;
} }
void Visualizer::ApplyWindow(double *output, int16_t *input, ssize_t samples) void Visualizer::ApplyWindow(double *output, const int16_t *input, ssize_t samples)
{ {
// Use Blackman window for low sidelobes and fast sidelobe rolloff // Use Blackman window for low sidelobes and fast sidelobe rolloff
// don't care too much about mainlobe width // don't care too much about mainlobe width
@@ -694,7 +696,7 @@ void Visualizer::FindOutputID()
void Visualizer::ResetAutoScaleMultiplier() void Visualizer::ResetAutoScaleMultiplier()
{ {
m_auto_scale_multiplier = std::numeric_limits<double>::infinity(); m_auto_scale_multiplier = 1;
} }
#endif // ENABLE_VISUALIZER #endif // ENABLE_VISUALIZER

22
src/screens/visualizer.h
View File

@@ -62,16 +62,16 @@ struct Visualizer: Screen<NC::Window>, Tabbable
void ResetAutoScaleMultiplier(); void ResetAutoScaleMultiplier();
private: private:
void DrawSoundWave(int16_t *, ssize_t, size_t, size_t); void DrawSoundWave(const int16_t *, ssize_t, size_t, size_t);
void DrawSoundWaveStereo(int16_t *, int16_t *, ssize_t, size_t); void DrawSoundWaveStereo(const int16_t *, const int16_t *, ssize_t, size_t);
void DrawSoundWaveFill(int16_t *, ssize_t, size_t, size_t); void DrawSoundWaveFill(const int16_t *, ssize_t, size_t, size_t);
void DrawSoundWaveFillStereo(int16_t *, int16_t *, ssize_t, size_t); void DrawSoundWaveFillStereo(const int16_t *, const int16_t *, ssize_t, size_t);
void DrawSoundEllipse(int16_t *, ssize_t, size_t, size_t); void DrawSoundEllipse(const int16_t *, ssize_t, size_t, size_t);
void DrawSoundEllipseStereo(int16_t *, int16_t *, ssize_t, size_t); void DrawSoundEllipseStereo(const int16_t *, const int16_t *, ssize_t, size_t);
# ifdef HAVE_FFTW3_H # ifdef HAVE_FFTW3_H
void DrawFrequencySpectrum(int16_t *, ssize_t, size_t, size_t); void DrawFrequencySpectrum(const int16_t *, ssize_t, size_t, size_t);
void DrawFrequencySpectrumStereo(int16_t *, int16_t *, ssize_t, size_t); void DrawFrequencySpectrumStereo(const int16_t *, const int16_t *, ssize_t, size_t);
void ApplyWindow(double *, int16_t *, ssize_t); void ApplyWindow(double *, const int16_t *, ssize_t);
void GenLogspace(); void GenLogspace();
double Bin2Hz(size_t); double Bin2Hz(size_t);
double Interpolate(size_t, size_t); double Interpolate(size_t, size_t);
@@ -79,8 +79,8 @@ private:
void SetVisualizationType(); void SetVisualizationType();
void (Visualizer::*draw)(int16_t *, ssize_t, size_t, size_t); void (Visualizer::*draw)(const int16_t *, ssize_t, size_t, size_t);
void (Visualizer::*drawStereo)(int16_t *, int16_t *, ssize_t, size_t); void (Visualizer::*drawStereo)(const int16_t *, const int16_t *, ssize_t, size_t);
int m_output_id; int m_output_id;
boost::posix_time::ptime m_timer; boost::posix_time::ptime m_timer;