RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 03:57:43 +00:00
Code Issues Activity Actions

LibAudio/Piano: Replace floats with doubles

Browse source 
We should default to double-precision so that clients can make the
choice to use float or double.
This commit is contained in:
William McPherson 2020-02-10 23:45:10 +11:00 • committed by Andreas Kling
parent d55d2b2794
commit aa149b9330
5 changed files with 30 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Libraries/LibAudio/Buffer.h
View file

@ -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)
{
@ -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;
}
@ -83,8 +83,8 @@ struct Sample {
return *this;
}
float left;
float right;
double left;
double right;
};
// Small helper to resample from one playback rate to another
@ -92,16 +92,16 @@ struct Sample {
// 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.

22
Libraries/LibAudio/WavLoader.cpp
View file

@ -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;
@ -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:
@ -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;
@ -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