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

LibAudio: Handle all integer PCM sample formats "correctly" in WavWriter

Browse source 
WavWriter needs a TON of modernization work, but for now this commit
just tackles two FIXMEs by converting samples correctly into all
supported integer PCM formats. The supported formats are only signed
16-bit and unsigned 8-bit for now, but can be expanded later. At least
we don't produce horrible speaker-destroying noise when writing any
other format.
This commit is contained in:
kleines Filmröllchen 2023-03-08 15:25:56 +01:00 • committed by Jelle Raaijmakers
parent 102fdf6305
commit cd2e890304
2 changed files with 44 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Userland/Libraries/LibAudio/WavWriter.h
View file

@ -11,6 +11,7 @@
#include <AK/RefPtr.h>
#include <AK/StringView.h>
#include <LibAudio/Sample.h>
#include <LibAudio/SampleFormats.h>
#include <LibCore/File.h>
#include <LibCore/Forward.h>
@ -21,8 +22,8 @@ class WavWriter {
AK_MAKE_NONMOVABLE(WavWriter);
public:
static ErrorOr<NonnullOwnPtr<WavWriter>> create_from_file(StringView path, int sample_rate = 44100, u16 num_channels = 2, u16 bits_per_sample = 16);
WavWriter(int sample_rate = 44100, u16 num_channels = 2, u16 bits_per_sample = 16);
static ErrorOr<NonnullOwnPtr<WavWriter>> create_from_file(StringView path, int sample_rate = 44100, u16 num_channels = 2, PcmSampleFormat sample_format = PcmSampleFormat::Int16);
WavWriter(int sample_rate = 44100, u16 num_channels = 2, PcmSampleFormat sample_format = PcmSampleFormat::Int16);
~WavWriter();
ErrorOr<void> write_samples(Span<Sample> samples);
@ -30,13 +31,13 @@ public:
u32 sample_rate() const { return m_sample_rate; }
u16 num_channels() const { return m_num_channels; }
u16 bits_per_sample() const { return m_bits_per_sample; }
PcmSampleFormat sample_format() const { return m_sample_format; }
Core::File& file() const { return *m_file; }
ErrorOr<void> set_file(StringView path);
void set_num_channels(int num_channels) { m_num_channels = num_channels; }
void set_sample_rate(int sample_rate) { m_sample_rate = sample_rate; }
void set_bits_per_sample(int bits_per_sample) { m_bits_per_sample = bits_per_sample; }
void set_sample_format(PcmSampleFormat sample_format) { m_sample_format = sample_format; }
private:
ErrorOr<void> write_header();
@ -45,7 +46,7 @@ private:
u32 m_sample_rate;
u16 m_num_channels;
u16 m_bits_per_sample;
PcmSampleFormat m_sample_format;
u32 m_data_sz { 0 };
};