RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 18:18:12 +00:00
Code Issues Activity Actions

Work on AudioServer

Browse source 
The center of this is now an ABuffer class in LibAudio.
ABuffer contains ASample, which has two channels (left/right) in
floating point for mixing purposes, in 44100hz.

This means that the loaders (AWavLoader in this case) needs to do some
manipulation to get things in the right format, but that we don't need
to care after format loading is done.

While we're at it, do some correctness fixes. PCM data is unsigned if
it's 8 bit, but 16 bit is signed. And /dev/audio also wants signed 16
bit audio, so give it what it wants.

On top of this, AudioServer now accepts requests to play a buffer.
The IPC mechanism here is pretty much a 1:1 copy-paste from
LibGUI/WindowServer. It can be generalized more in the future, but for
now I want to get AudioServer working decently first :)

Additionally, add a little "aplay" tool to load and play a WAV file. It
will break with large WAVs (run out of memory, heh...) but it's a start.

Future work needs to make AudioServer block buffer submission from
clients until it has played the buffer they are requesting to play.
This commit is contained in:
Robin Burchell 2019-07-15 12:54:52 +02:00 • committed by Andreas Kling
parent 3db9706e57
commit 2df6f0e87f
19 changed files with 873 additions and 141 deletions
Download patch file Download diff file Expand all files Collapse all files

82
Servers/AudioServer/main.cpp
View file

@ -1,86 +1,6 @@
#include <LibCore/CFile.h>
#include <LibCore/CEventLoop.h>
#include <LibCore/CLocalSocket.h>
#include <LibCore/CNotifier.h>
#include <LibAudio/AWavLoader.h>
#include <LibAudio/AWavFile.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <unistd.h>
class ASEventLoop
{
public:
ASEventLoop();
int exec() { return m_event_loop.exec(); }
private:
CEventLoop m_event_loop;
CLocalSocket m_server_sock;
OwnPtr<CNotifier> m_server_notifier;
void drain_server();
};
void read_and_play_wav()
{
CFile audio("/dev/audio");
if (!audio.open(CIODevice::WriteOnly)) {
dbgprintf("Can't open audio device: %s\n", audio.error_string());
return;
}
AWavLoader loader;
const auto& file = loader.load_wav("/home/anon/tmp.wav");
if (!file) {
dbgprintf("Can't parse WAV: %s\n", loader.error_string());
return;
}
dbgprintf("Read WAV of format %d with num_channels %d sample rate %d, bits per sample %d\n", (u8)file->format(), file->channel_count(), file->sample_rate_per_second(), file->bits_per_sample());
auto contents = file->sample_data();
const int chunk_size = 4096;
int i = 0;
while (i < contents.size()) {
const auto chunk = contents.slice(i, chunk_size);
audio.write(chunk);
i += chunk_size;
}
}
ASEventLoop::ASEventLoop()
{
read_and_play_wav();
unlink("/tmp/asportal");
sockaddr_un address;
address.sun_family = AF_LOCAL;
strcpy(address.sun_path, "/tmp/asportal");
int rc = bind(m_server_sock.fd(), (const sockaddr*)&address, sizeof(address));
ASSERT(rc == 0);
rc = listen(m_server_sock.fd(), 5);
ASSERT(rc == 0);
m_server_notifier = make<CNotifier>(m_server_sock.fd(), CNotifier::Read);
m_server_notifier->on_ready_to_read = [this] { drain_server(); };
}
void ASEventLoop::drain_server()
{
sockaddr_un address;
socklen_t address_size = sizeof(address);
int client_fd = accept(m_server_sock.fd(), (sockaddr*)&address, &address_size);
if (client_fd < 0) {
dbgprintf("WindowServer: accept() failed: %s\n", strerror(errno));
} else {
dbgprintf("AudioServer: accept()ed client %d\n", client_fd);
String s("hello, client!\n");
write(client_fd, s.characters(), s.length());
close(client_fd);
}
}
#include "ASEventLoop.h"
int main(int, char**)
{