RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 20:37:34 +00:00
Code Issues Activity Actions

LibAudio: Split Buffer.{h, cpp} into three files

Browse source 
The Buffer files had contained both the ResampleHelper and the
sample format utilities. Because the Buffer class (and its file) is
going to be deleted soon, this commit separates those two things into
their own files.
This commit is contained in:
kleines Filmröllchen 2022-01-23 15:21:56 +01:00 • committed by Andreas Kling
parent 262488ea33
commit 5d01db3493
7 changed files with 169 additions and 149 deletions
Download patch file Download diff file Expand all files Collapse all files

104
Userland/Libraries/LibAudio/Buffer.cpp
View file

@ -13,31 +13,6 @@
namespace Audio {
u16 pcm_bits_per_sample(PcmSampleFormat format)
{
switch (format) {
case Uint8:
return 8;
case Int16:
return 16;
case Int24:
return 24;
case Int32:
case Float32:
return 32;
case Float64:
return 64;
default:
VERIFY_NOT_REACHED();
}
}
String sample_format_name(PcmSampleFormat format)
{
bool is_float = format == Float32 || format == Float64;
return String::formatted("PCM {}bit {}", pcm_bits_per_sample(format), is_float ? "Float" : "LE");
}
i32 Buffer::allocate_id()
{
static Atomic<i32> next_id;
@ -161,83 +136,4 @@ ErrorOr<NonnullRefPtr<Buffer>> Buffer::from_pcm_stream(InputMemoryStream& stream
return Buffer::create_with_samples(move(fdata));
}
template<typename SampleType>
ResampleHelper<SampleType>::ResampleHelper(u32 source, u32 target)
: m_source(source)
, m_target(target)
{
VERIFY(source > 0);
VERIFY(target > 0);
}
template ResampleHelper<i32>::ResampleHelper(u32, u32);
template ResampleHelper<double>::ResampleHelper(u32, u32);
template<typename SampleType>
Vector<SampleType> ResampleHelper<SampleType>::resample(Vector<SampleType> to_resample)
{
Vector<SampleType> resampled;
resampled.ensure_capacity(to_resample.size() * ceil_div(m_source, m_target));
for (auto sample : to_resample) {
process_sample(sample, sample);
while (read_sample(sample, sample))
resampled.unchecked_append(sample);
}
return resampled;
}
template Vector<i32> ResampleHelper<i32>::resample(Vector<i32>);
template Vector<double> ResampleHelper<double>::resample(Vector<double>);
ErrorOr<NonnullRefPtr<Buffer>> resample_buffer(ResampleHelper<double>& resampler, Buffer const& to_resample)
{
Vector<Sample> resampled;
resampled.ensure_capacity(to_resample.sample_count() * ceil_div(resampler.source(), resampler.target()));
for (size_t i = 0; i < static_cast<size_t>(to_resample.sample_count()); ++i) {
auto sample = to_resample.samples()[i];
resampler.process_sample(sample.left, sample.right);
while (resampler.read_sample(sample.left, sample.right))
resampled.append(sample);
}
return Buffer::create_with_samples(move(resampled));
}
template<typename SampleType>
void ResampleHelper<SampleType>::process_sample(SampleType sample_l, SampleType sample_r)
{
m_last_sample_l = sample_l;
m_last_sample_r = sample_r;
m_current_ratio += m_target;
}
template void ResampleHelper<i32>::process_sample(i32, i32);
template void ResampleHelper<double>::process_sample(double, double);
template<typename SampleType>
bool ResampleHelper<SampleType>::read_sample(SampleType& next_l, SampleType& next_r)
{
if (m_current_ratio >= m_source) {
m_current_ratio -= m_source;
next_l = m_last_sample_l;
next_r = m_last_sample_r;
return true;
}
return false;
}
template bool ResampleHelper<i32>::read_sample(i32&, i32&);
template bool ResampleHelper<double>::read_sample(double&, double&);
template<typename SampleType>
void ResampleHelper<SampleType>::reset()
{
m_current_ratio = 0;
m_last_sample_l = {};
m_last_sample_r = {};
}
template void ResampleHelper<i32>::reset();
template void ResampleHelper<double>::reset();
}