Skip to content

Commit

Permalink
LibAudio/Piano: Replace floats with doubles
Browse files Browse the repository at this point in the history
We should default to double-precision so that clients can make the
choice to use float or double.
  • Loading branch information
willmcpherson2 authored and awesomekling committed Feb 10, 2020
1 parent d55d2b2 commit aa149b9
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 30 deletions.
10 changes: 5 additions & 5 deletions Applications/Piano/AudioEngine.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -158,10 +158,10 @@ String AudioEngine::set_recorded_sample(const StringView& path)
m_recorded_sample.clear();
m_recorded_sample.resize(wav_buffer->sample_count());

float peak = 0;
double peak = 0;
for (int i = 0; i < wav_buffer->sample_count(); ++i) {
float left_abs = fabs(wav_buffer->samples()[i].left);
float right_abs = fabs(wav_buffer->samples()[i].right);
double left_abs = fabs(wav_buffer->samples()[i].left);
double right_abs = fabs(wav_buffer->samples()[i].right);
if (left_abs > peak)
peak = left_abs;
if (right_abs > peak)
Expand Down Expand Up @@ -228,8 +228,8 @@ Audio::Sample AudioEngine::recorded_sample(size_t note)
int t = m_pos[note];
if (t >= m_recorded_sample.size())
return 0;
float w_left = m_recorded_sample[t].left;
float w_right = m_recorded_sample[t].right;
double w_left = m_recorded_sample[t].left;
double w_right = m_recorded_sample[t].right;
if (t + 1 < m_recorded_sample.size()) {
double t_fraction = m_pos[note] - t;
w_left += (m_recorded_sample[t + 1].left - m_recorded_sample[t].left) * t_fraction;
Expand Down
2 changes: 1 addition & 1 deletion Applications/Piano/SamplerWidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ WaveEditor::~WaveEditor()
{
}

int WaveEditor::sample_to_y(float percentage) const
int WaveEditor::sample_to_y(double percentage) const
{
double portion_of_half_height = percentage * ((frame_inner_rect().height() - 1) / 2.0);
double y = (frame_inner_rect().height() / 2.0) + portion_of_half_height;
Expand Down
2 changes: 1 addition & 1 deletion Applications/Piano/SamplerWidget.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class WaveEditor final : public GUI::Frame {

virtual void paint_event(GUI::PaintEvent&) override;

int sample_to_y(float percentage) const;
int sample_to_y(double percentage) const;

AudioEngine& m_audio_engine;
};
Expand Down
24 changes: 12 additions & 12 deletions Libraries/LibAudio/Buffer.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,14 @@ struct Sample {
}

// For mono
Sample(float left)
Sample(double left)
: left(left)
, right(left)
{
}

// For stereo
Sample(float left, float right)
Sample(double left, double right)
: left(left)
, right(right)
{
Expand All @@ -71,7 +71,7 @@ struct Sample {

void scale(int percent)
{
float pct = (float)percent / 100.0;
double pct = (double)percent / 100.0;
left *= pct;
right *= pct;
}
Expand All @@ -83,25 +83,25 @@ struct Sample {
return *this;
}

float left;
float right;
double left;
double right;
};

// Small helper to resample from one playback rate to another
// This isn't really "smart", in that we just insert (or drop) samples.
// Should do better...
class ResampleHelper {
public:
ResampleHelper(float source, float target);
ResampleHelper(double source, double target);

void process_sample(float sample_l, float sample_r);
bool read_sample(float& next_l, float& next_r);
void process_sample(double sample_l, double sample_r);
bool read_sample(double& next_l, double& next_r);

private:
const float m_ratio;
float m_current_ratio { 0 };
float m_last_sample_l { 0 };
float m_last_sample_r { 0 };
const double m_ratio;
double m_current_ratio { 0 };
double m_last_sample_l { 0 };
double m_last_sample_r { 0 };
};

// A buffer of audio samples, normalized to 44100hz.
Expand Down
22 changes: 11 additions & 11 deletions Libraries/LibAudio/WavLoader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -182,19 +182,19 @@ bool WavLoader::parse_header()
return true;
}

ResampleHelper::ResampleHelper(float source, float target)
ResampleHelper::ResampleHelper(double source, double target)
: m_ratio(source / target)
{
}

void ResampleHelper::process_sample(float sample_l, float sample_r)
void ResampleHelper::process_sample(double sample_l, double sample_r)
{
m_last_sample_l = sample_l;
m_last_sample_r = sample_r;
m_current_ratio += 1;
}

bool ResampleHelper::read_sample(float& next_l, float& next_r)
bool ResampleHelper::read_sample(double& next_l, double& next_r)
{
if (m_current_ratio > 0) {
m_current_ratio -= m_ratio;
Expand All @@ -209,8 +209,8 @@ bool ResampleHelper::read_sample(float& next_l, float& next_r)
template<typename SampleReader>
static void read_samples_from_stream(BufferStream& stream, SampleReader read_sample, Vector<Sample>& samples, ResampleHelper& resampler, int num_channels)
{
float norm_l = 0;
float norm_r = 0;
double norm_l = 0;
double norm_r = 0;

switch (num_channels) {
case 1:
Expand Down Expand Up @@ -245,7 +245,7 @@ static void read_samples_from_stream(BufferStream& stream, SampleReader read_sam
}
}

static float read_norm_sample_24(BufferStream& stream)
static double read_norm_sample_24(BufferStream& stream)
{
u8 byte = 0;
stream >> byte;
Expand All @@ -259,21 +259,21 @@ static float read_norm_sample_24(BufferStream& stream)
value = sample1 << 8;
value |= (sample2 << 16);
value |= (sample3 << 24);
return float(value) / std::numeric_limits<i32>::max();
return double(value) / std::numeric_limits<i32>::max();
}

static float read_norm_sample_16(BufferStream& stream)
static double read_norm_sample_16(BufferStream& stream)
{
i16 sample = 0;
stream >> sample;
return float(sample) / std::numeric_limits<i16>::max();
return double(sample) / std::numeric_limits<i16>::max();
}

static float read_norm_sample_8(BufferStream& stream)
static double read_norm_sample_8(BufferStream& stream)
{
u8 sample = 0;
stream >> sample;
return float(sample) / std::numeric_limits<u8>::max();
return double(sample) / std::numeric_limits<u8>::max();
}

// ### can't const this because BufferStream is non-const
Expand Down

0 comments on commit aa149b9

Please sign in to comment.