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

LibAudio: Run clang-format on all of it to make editing easier.

Browse source
This commit is contained in:
Andreas Kling 2019-07-27 14:30:09 +02:00
parent 9ed7f4576b
commit c7a4c8f93b
4 changed files with 54 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Libraries/LibAudio/AClientConnection.cpp
View file

@ -1,6 +1,6 @@
#include <SharedBuffer.h>
#include <LibAudio/ABuffer.h> #include <LibAudio/ABuffer.h>
#include "AClientConnection.h" #include <LibAudio/AClientConnection.h>
#include <SharedBuffer.h>
AClientConnection::AClientConnection() AClientConnection::AClientConnection()
: Connection("/tmp/asportal") : Connection("/tmp/asportal")

9
Libraries/LibAudio/AClientConnection.h
View file

@ -1,16 +1,15 @@
#pragma once #pragma once
#include <LibCore/CLocalSocket.h>
#include <LibCore/CNotifier.h>
#include <LibCore/CoreIPCClient.h>
#include <LibAudio/ASAPI.h> #include <LibAudio/ASAPI.h>
#include <LibCore/CoreIPCClient.h>
class ABuffer; class ABuffer;
class AClientConnection : public IPC::Client::Connection<ASAPI_ServerMessage, ASAPI_ClientMessage> { class AClientConnection : public IPC::Client::Connection<ASAPI_ServerMessage, ASAPI_ClientMessage> {
C_OBJECT(AClientConnection)
public: public:
AClientConnection(); AClientConnection();
void handshake() override; virtual void handshake() override;
void play(const ABuffer& buffer); void play(const ABuffer&);
}; };

72
Libraries/LibAudio/AWavLoader.cpp
View file

@ -1,10 +1,9 @@
#include <LibCore/CFile.h>
#include <AK/BufferStream.h> #include <AK/BufferStream.h>
#include <LibAudio/ABuffer.h>
#include <LibAudio/AWavLoader.h>
#include <LibCore/CFile.h>
#include <limits> #include <limits>
#include "AWavLoader.h"
#include "ABuffer.h"
RefPtr<ABuffer> AWavLoader::load_wav(const StringView& path) RefPtr<ABuffer> AWavLoader::load_wav(const StringView& path)
{ {
m_error_string = {}; m_error_string = {};
@ -24,64 +23,75 @@ RefPtr<ABuffer> AWavLoader::parse_wav(ByteBuffer& buffer)
{ {
BufferStream stream(buffer); BufferStream stream(buffer);
#define CHECK_OK(msg) \ #define CHECK_OK(msg) \
do { \ do { \
ASSERT(ok); \ ASSERT(ok); \
if (stream.handle_read_failure()) { \ if (stream.handle_read_failure()) { \
m_error_string = String::format("Premature stream EOF at %s", msg); \ m_error_string = String::format("Premature stream EOF at %s", msg); \
return {}; \ return {}; \
} \ } \
if (!ok) { \ if (!ok) { \
m_error_string = String::format("Parsing failed: %s", msg); \ m_error_string = String::format("Parsing failed: %s", msg); \
return {}; \ return {}; \
} else { \ } else { \
dbgprintf("%s is OK!\n", msg); \ dbgprintf("%s is OK!\n", msg); \
} \ } \
} while (0); } while (0);
bool ok = true; bool ok = true;
u32 riff; stream >> riff; u32 riff;
stream >> riff;
ok = ok && riff == 0x46464952; // "RIFF" ok = ok && riff == 0x46464952; // "RIFF"
CHECK_OK("RIFF header"); CHECK_OK("RIFF header");
u32 sz; stream >> sz; u32 sz;
stream >> sz;
ok = ok && sz < 1024 * 1024 * 42; // arbitrary ok = ok && sz < 1024 * 1024 * 42; // arbitrary
CHECK_OK("File size"); CHECK_OK("File size");
ASSERT(sz < 1024 * 1024 * 42); ASSERT(sz < 1024 * 1024 * 42);
u32 wave; stream >> wave; u32 wave;
stream >> wave;
ok = ok && wave == 0x45564157; // "WAVE" ok = ok && wave == 0x45564157; // "WAVE"
CHECK_OK("WAVE header"); CHECK_OK("WAVE header");
u32 fmt_id; stream >> fmt_id; u32 fmt_id;
stream >> fmt_id;
ok = ok && fmt_id == 0x20746D66; // "FMT" ok = ok && fmt_id == 0x20746D66; // "FMT"
CHECK_OK("FMT header"); CHECK_OK("FMT header");
u32 fmt_size; stream >> fmt_size; u32 fmt_size;
stream >> fmt_size;
ok = ok && fmt_size == 16; ok = ok && fmt_size == 16;
CHECK_OK("FMT size"); CHECK_OK("FMT size");
ASSERT(fmt_size == 16); ASSERT(fmt_size == 16);
u16 audio_format; stream >> audio_format; u16 audio_format;
CHECK_OK("Audio format"); // incomplete read check stream >> audio_format;
CHECK_OK("Audio format"); // incomplete read check
ok = ok && audio_format == 1; // WAVE_FORMAT_PCM ok = ok && audio_format == 1; // WAVE_FORMAT_PCM
ASSERT(audio_format == 1); ASSERT(audio_format == 1);
CHECK_OK("Audio format"); // value check CHECK_OK("Audio format"); // value check
u16 num_channels; stream >> num_channels; u16 num_channels;
stream >> num_channels;
ok = ok && (num_channels == 1 || num_channels == 2); ok = ok && (num_channels == 1 || num_channels == 2);
CHECK_OK("Channel count"); CHECK_OK("Channel count");
u32 sample_rate; stream >> sample_rate; u32 sample_rate;
stream >> sample_rate;
CHECK_OK("Sample rate"); CHECK_OK("Sample rate");
u32 byte_rate; stream >> byte_rate; u32 byte_rate;
stream >> byte_rate;
CHECK_OK("Byte rate"); CHECK_OK("Byte rate");
u16 block_align; stream >> block_align; u16 block_align;
stream >> block_align;
CHECK_OK("Block align"); CHECK_OK("Block align");
u16 bits_per_sample; stream >> bits_per_sample; u16 bits_per_sample;
stream >> bits_per_sample;
CHECK_OK("Bits per sample"); // incomplete read check CHECK_OK("Bits per sample"); // incomplete read check
ok = ok && (bits_per_sample == 8 || bits_per_sample == 16 || bits_per_sample == 24); ok = ok && (bits_per_sample == 8 || bits_per_sample == 16 || bits_per_sample == 24);
ASSERT(bits_per_sample == 8 || bits_per_sample == 16 || bits_per_sample == 24); ASSERT(bits_per_sample == 8 || bits_per_sample == 16 || bits_per_sample == 24);
@ -91,7 +101,8 @@ RefPtr<ABuffer> AWavLoader::parse_wav(ByteBuffer& buffer)
bool found_data = false; bool found_data = false;
u32 data_sz = 0; u32 data_sz = 0;
while (true) { while (true) {
u32 chunk_id; stream >> chunk_id; u32 chunk_id;
stream >> chunk_id;
CHECK_OK("Reading chunk ID searching for data"); CHECK_OK("Reading chunk ID searching for data");
stream >> data_sz; stream >> data_sz;
CHECK_OK("Reading chunk size searching for data"); CHECK_OK("Reading chunk size searching for data");
@ -130,6 +141,7 @@ public:
AResampleHelper(float source, float target); AResampleHelper(float source, float target);
bool read_sample(); bool read_sample();
void prepare(); void prepare();
private: private:
const float m_ratio; const float m_ratio;
float m_current_ratio { 0 }; float m_current_ratio { 0 };
@ -155,7 +167,7 @@ bool AResampleHelper::read_sample()
return false; return false;
} }
template <typename SampleReader> template<typename SampleReader>
static void read_samples_from_stream(BufferStream& stream, SampleReader read_sample, Vector<ASample>& samples, int num_channels, int source_rate) static void read_samples_from_stream(BufferStream& stream, SampleReader read_sample, Vector<ASample>& samples, int num_channels, int source_rate)
{ {
AResampleHelper resampler(source_rate, 44100); AResampleHelper resampler(source_rate, 44100);

8
Libraries/LibAudio/AWavLoader.h
View file

@ -1,18 +1,22 @@
#pragma once #pragma once
#include <AK/AKString.h>
#include <AK/RefPtr.h> #include <AK/RefPtr.h>
#include <AK/StringView.h> #include <AK/StringView.h>
#include <AK/AKString.h>
class ABuffer; class ABuffer;
namespace AK {
class ByteBuffer; class ByteBuffer;
}
// Parses a WAV file and produces an ABuffer instance from it // Parses a WAV file and produces an ABuffer instance from it
class AWavLoader { class AWavLoader {
public: public:
RefPtr<ABuffer> load_wav(const StringView& path); RefPtr<ABuffer> load_wav(const StringView& path);
const char* error_string() { return m_error_string.characters(); } const char* error_string() { return m_error_string.characters(); }
private: private:
RefPtr<ABuffer> parse_wav(ByteBuffer& buffer); RefPtr<ABuffer> parse_wav(ByteBuffer&);
String m_error_string; String m_error_string;
}; };