mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 01:07:36 +00:00
LibAudio: Support 32 and 64-bit float WAV files
LibAudio's WavLoader plugin for loading WAV files now supports loading audio files with 32-bit float or 64-bit float samples. By supporting these new non-int sample formats, Audio::Buffer now stores the sample format (out of a list of supported formats) instead of the raw bit depth. (The bit depth is easily calculated with pcm_bits_per_sample)
This commit is contained in:
parent
91c210c39a
commit
563cc17a50
5 changed files with 127 additions and 35 deletions
|
@ -1,14 +1,41 @@
|
|||
/*
|
||||
* Copyright (c) 2018-2020, Andreas Kling <kling@serenityos.org>
|
||||
* Copyright (c) 2021, kleines Filmröllchen <malu.bertsch@gmail.com>
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-2-Clause
|
||||
*/
|
||||
|
||||
#include <AK/Atomic.h>
|
||||
#include <AK/Debug.h>
|
||||
#include <AK/String.h>
|
||||
#include <LibAudio/Buffer.h>
|
||||
|
||||
namespace Audio {
|
||||
|
||||
u16 pcm_bits_per_sample(PcmSampleFormat format)
|
||||
{
|
||||
switch (format) {
|
||||
case Uint8:
|
||||
return 8;
|
||||
case Int16:
|
||||
return 16;
|
||||
case Int24:
|
||||
return 24;
|
||||
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;
|
||||
|
@ -54,6 +81,20 @@ static void read_samples_from_stream(InputMemoryStream& stream, SampleReader rea
|
|||
}
|
||||
}
|
||||
|
||||
static double read_float_sample_64(InputMemoryStream& stream)
|
||||
{
|
||||
LittleEndian<double> sample;
|
||||
stream >> sample;
|
||||
return double(sample);
|
||||
}
|
||||
|
||||
static double read_float_sample_32(InputMemoryStream& stream)
|
||||
{
|
||||
LittleEndian<float> sample;
|
||||
stream >> sample;
|
||||
return double(sample);
|
||||
}
|
||||
|
||||
static double read_norm_sample_24(InputMemoryStream& stream)
|
||||
{
|
||||
u8 byte = 0;
|
||||
|
@ -85,27 +126,33 @@ static double read_norm_sample_8(InputMemoryStream& stream)
|
|||
return double(sample) / NumericLimits<u8>::max();
|
||||
}
|
||||
|
||||
RefPtr<Buffer> Buffer::from_pcm_data(ReadonlyBytes data, ResampleHelper& resampler, int num_channels, int bits_per_sample)
|
||||
RefPtr<Buffer> Buffer::from_pcm_data(ReadonlyBytes data, ResampleHelper& resampler, int num_channels, PcmSampleFormat sample_format)
|
||||
{
|
||||
InputMemoryStream stream { data };
|
||||
return from_pcm_stream(stream, resampler, num_channels, bits_per_sample, data.size() / (bits_per_sample / 8));
|
||||
return from_pcm_stream(stream, resampler, num_channels, sample_format, data.size() / (pcm_bits_per_sample(sample_format) / 8));
|
||||
}
|
||||
|
||||
RefPtr<Buffer> Buffer::from_pcm_stream(InputMemoryStream& stream, ResampleHelper& resampler, int num_channels, int bits_per_sample, int num_samples)
|
||||
RefPtr<Buffer> Buffer::from_pcm_stream(InputMemoryStream& stream, ResampleHelper& resampler, int num_channels, PcmSampleFormat sample_format, int num_samples)
|
||||
{
|
||||
Vector<Frame> fdata;
|
||||
fdata.ensure_capacity(num_samples);
|
||||
|
||||
switch (bits_per_sample) {
|
||||
case 8:
|
||||
switch (sample_format) {
|
||||
case PcmSampleFormat::Uint8:
|
||||
read_samples_from_stream(stream, read_norm_sample_8, fdata, resampler, num_channels);
|
||||
break;
|
||||
case 16:
|
||||
case PcmSampleFormat::Int16:
|
||||
read_samples_from_stream(stream, read_norm_sample_16, fdata, resampler, num_channels);
|
||||
break;
|
||||
case 24:
|
||||
case PcmSampleFormat::Int24:
|
||||
read_samples_from_stream(stream, read_norm_sample_24, fdata, resampler, num_channels);
|
||||
break;
|
||||
case PcmSampleFormat::Float32:
|
||||
read_samples_from_stream(stream, read_float_sample_32, fdata, resampler, num_channels);
|
||||
break;
|
||||
case PcmSampleFormat::Float64:
|
||||
read_samples_from_stream(stream, read_float_sample_64, fdata, resampler, num_channels);
|
||||
break;
|
||||
default:
|
||||
VERIFY_NOT_REACHED();
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue