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

new feature: support for stereo visualization

Browse Source
This commit is contained in:
Andrzej Rybczak
2011-11-09 17:46:20 +01:00
parent 78cd46b756
commit 0e6306849c
6 changed files with 68 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/settings.cpp
+5
View File
@@ -426,6 +426,7 @@ void NcmpcppConfig::SetDefaults()
mouse_list_scroll_whole_page = true;
new_design = false;
visualizer_use_wave = true;
visualizer_in_stereo = false;
browser_sort_by_mtime = false;
tag_editor_extended_numeration = false;
media_library_display_date = true;
@@ -1056,6 +1057,10 @@ void NcmpcppConfig::Read()
{
visualizer_use_wave = v == "wave";
}
else if (cl.find("visualizer_in_stereo") != std::string::npos)
{
visualizer_in_stereo = v == "yes";
}
else if (cl.find("mouse_support") != std::string::npos)
{
mouse_support = v == "yes";
src/settings.h
+1
View File
@@ -248,6 +248,7 @@ struct NcmpcppConfig
bool mouse_list_scroll_whole_page;
bool new_design;
bool visualizer_use_wave;
bool visualizer_in_stereo;
bool browser_sort_by_mtime;
bool tag_editor_extended_numeration;
bool media_library_display_date;
src/visualizer.cpp
+43 -28
View File
@@ -37,23 +37,20 @@ using Global::MainHeight;
Visualizer *myVisualizer = new Visualizer;
const unsigned Visualizer::Samples = 2048;
#ifdef HAVE_FFTW3_H
const unsigned Visualizer::FFTResults = Samples/2+1;
#endif // HAVE_FFTW3_H
int Visualizer::WindowTimeout = 1000/25; /* 25 fps */
const int Visualizer::WindowTimeout = 1000/25; /* 25 fps */
void Visualizer::Init()
{
w = new Window(0, MainStartY, COLS, MainHeight, "", Config.visualizer_color, brNone);
ResetFD();
itsSamples = Config.visualizer_in_stereo ? 4096 : 2048;
# ifdef HAVE_FFTW3_H
itsFreqsMagnitude = new unsigned[FFTResults];
itsInput = static_cast<double *>(fftw_malloc(sizeof(double)*Samples));
itsOutput = static_cast<fftw_complex *>(fftw_malloc(sizeof(fftw_complex)*FFTResults));
itsPlan = fftw_plan_dft_r2c_1d(Samples, itsInput, itsOutput, FFTW_ESTIMATE);
itsFFTResults = itsSamples/2+1;
itsFreqsMagnitude = new unsigned[itsFFTResults];
itsInput = static_cast<double *>(fftw_malloc(sizeof(double)*itsSamples));
itsOutput = static_cast<fftw_complex *>(fftw_malloc(sizeof(fftw_complex)*itsFFTResults));
itsPlan = fftw_plan_dft_r2c_1d(itsSamples, itsInput, itsOutput, FFTW_ESTIMATE);
# endif // HAVE_FFTW3_H
FindOutputID();
@@ -106,8 +103,8 @@ void Visualizer::Update()
if (itsFifo < 0)
return;
// it supports only PCM in format 44100:16:1
static int16_t buf[Samples];
// PCM in format 44100:16:1 (for mono visualization) and 44100:16:2 (for stereo visualization) is supported
int16_t buf[itsSamples];
ssize_t data = read(itsFifo, buf, sizeof(buf));
if (data < 0) // no data available in fifo
return;
@@ -120,12 +117,30 @@ void Visualizer::Update()
gettimeofday(&itsTimer, 0);
}
w->Clear();
void (Visualizer::*draw)(int16_t *, ssize_t, size_t, size_t);
# ifdef HAVE_FFTW3_H
Config.visualizer_use_wave ? DrawSoundWave(buf, data) : DrawFrequencySpectrum(buf, data);
# else
DrawSoundWave(buf, data);
if (!Config.visualizer_use_wave)
draw = &Visualizer::DrawFrequencySpectrum;
else
# endif // HAVE_FFTW3_H
draw = &Visualizer::DrawSoundWave;
w->Clear();
if (Config.visualizer_in_stereo)
{
ssize_t bytes_read = data/sizeof(int16_t);
int16_t buf_left[bytes_read/2], buf_right[bytes_read/2];
for (ssize_t i = 0, j = 0; i < bytes_read; i += 2, ++j)
{
buf_left[j] = buf[i];
buf_right[j] = buf[i+1];
}
size_t half_height = MainHeight/2;
(this->*draw)(buf_left, data/2, 0, half_height);
(this->*draw)(buf_right, data/2, half_height+(draw == &Visualizer::DrawSoundWave ? 1 : 0), half_height+(draw != &Visualizer::DrawSoundWave ? 1 : 0));
}
else
(this->*draw)(buf, data, 0, MainHeight);
w->Refresh();
}
@@ -137,10 +152,10 @@ void Visualizer::SpacePressed()
# endif // HAVE_FFTW3_H
}
void Visualizer::DrawSoundWave(int16_t *buf, ssize_t data)
void Visualizer::DrawSoundWave(int16_t *buf, ssize_t data, size_t y_offset, size_t height)
{
const int samples_per_col = data/sizeof(int16_t)/COLS;
const int half_height = MainHeight/2;
const int half_height = height/2;
*w << fmtAltCharset;
double prev_point_pos = 0;
for (int i = 0; i < COLS; ++i)
@@ -151,7 +166,7 @@ void Visualizer::DrawSoundWave(int16_t *buf, ssize_t data)
point_pos /= samples_per_col;
point_pos /= std::numeric_limits<int16_t>::max();
point_pos *= half_height;
*w << XY(i, half_height+point_pos) << '`';
*w << XY(i, y_offset+half_height+point_pos) << '`';
if (i && abs(prev_point_pos-point_pos) > 2)
{
// if gap is too big. intermediate values are needed
@@ -159,7 +174,7 @@ void Visualizer::DrawSoundWave(int16_t *buf, ssize_t data)
const int breakpoint = std::max(prev_point_pos, point_pos);
const int half = (prev_point_pos+point_pos)/2;
for (int k = std::min(prev_point_pos, point_pos)+1; k < breakpoint; k += 2)
*w << XY(i-(k < half), half_height+k) << '`';
*w << XY(i-(k < half), y_offset+half_height+k) << '`';
}
prev_point_pos = point_pos;
}
@@ -167,27 +182,27 @@ void Visualizer::DrawSoundWave(int16_t *buf, ssize_t data)
}
#ifdef HAVE_FFTW3_H
void Visualizer::DrawFrequencySpectrum(int16_t *buf, ssize_t data)
void Visualizer::DrawFrequencySpectrum(int16_t *buf, ssize_t data, size_t y_offset, size_t height)
{
// zero old values
std::fill(buf+data/sizeof(int16_t), buf+Samples, 0);
for (unsigned i = 0; i < Samples; ++i)
std::fill(buf+data/sizeof(int16_t), buf+data/2, 0);
for (unsigned i = 0; i < data/2; ++i)
itsInput[i] = buf[i];
fftw_execute(itsPlan);
// count magnitude of each frequency and scale it to fit the screen
for (unsigned i = 0; i < FFTResults; ++i)
itsFreqsMagnitude[i] = sqrt(itsOutput[i][0]*itsOutput[i][0] + itsOutput[i][1]*itsOutput[i][1])/1e5*LINES/5;
for (unsigned i = 0; i < itsFFTResults; ++i)
itsFreqsMagnitude[i] = sqrt(itsOutput[i][0]*itsOutput[i][0] + itsOutput[i][1]*itsOutput[i][1])/1e5*height/5;
const int freqs_per_col = FFTResults/COLS /* cut bandwidth a little to achieve better look */ * 4/5;
const int freqs_per_col = itsFFTResults/COLS /* cut bandwidth a little to achieve better look */ * 4/5;
for (int i = 0; i < COLS; ++i)
{
size_t bar_height = 0;
for (int j = 0; j < freqs_per_col; ++j)
bar_height += itsFreqsMagnitude[i*freqs_per_col+j];
bar_height = std::min(bar_height/freqs_per_col, MainHeight);
mvwvline(w->Raw(), MainHeight-bar_height, i, 0, bar_height);
bar_height = std::min(bar_height/freqs_per_col, height);
mvwvline(w->Raw(), y_offset > 0 ? y_offset : height-bar_height, i, 0, bar_height);
}
}
#endif // HAVE_FFTW3_H
src/visualizer.h
+5 -9
View File
@@ -58,33 +58,29 @@ class Visualizer : public Screen<Window>
void ResetFD();
void FindOutputID();
static int WindowTimeout;
static const int WindowTimeout;
protected:
virtual void Init();
private:
void DrawSoundWave(int16_t *, ssize_t);
void DrawSoundWave(int16_t *, ssize_t, size_t, size_t);
# ifdef HAVE_FFTW3_H
void DrawFrequencySpectrum(int16_t *, ssize_t);
void DrawFrequencySpectrum(int16_t *, ssize_t, size_t, size_t);
# endif // HAVE_FFTW3_H
int itsOutputID;
timeval itsTimer;
int itsFifo;
unsigned itsSamples;
# ifdef HAVE_FFTW3_H
unsigned itsFFTResults;
unsigned *itsFreqsMagnitude;
double *itsInput;
fftw_complex *itsOutput;
fftw_plan itsPlan;
# endif // HAVE_FFTW3_H
static const unsigned Samples;
# ifdef HAVE_FFTW3_H
static const unsigned FFTResults;
# endif // HAVE_FFTW3_H
};
extern Visualizer *myVisualizer;