RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 14:07:45 +00:00
Code Issues Activity Actions

Audio: Make ABuffer sit on top of a SharedBuffer.

Browse source 
This allows us to carry the same buffer all the way from the WAV loader
to the AudioServer mixer.

This alleviates some of the stutter, but there's still a noticeable
skip when switching buffers. We're gonna need to do better. :^)
This commit is contained in:
Andreas Kling 2019-07-27 18:17:17 +02:00
parent b805f112c2
commit 5e01dde7b1
6 changed files with 38 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Servers/AudioServer/ASMixer.cpp
View file

@ -20,11 +20,11 @@ ASMixer::ASMixer()
}, this);
}
void ASMixer::queue(ASClientConnection& client, const ABuffer& buffer, int buffer_id)
void ASMixer::queue(ASClientConnection& client, const ABuffer& buffer)
{
ASSERT(buffer.size_in_bytes());
CLocker lock(m_lock);
m_pending_mixing.append(ASMixerBuffer(buffer, client, buffer_id));
m_pending_mixing.append(ASMixerBuffer(buffer, client));
}
void ASMixer::mix()
@ -68,19 +68,20 @@ void ASMixer::mix()
for (auto& buffer : active_mix_buffers) {
if (buffer.done)
continue;
auto& samples = buffer.buffer->samples();
auto* samples = buffer.buffer->samples();
auto sample_count = buffer.buffer->sample_count();
for (int i = 0; i < max_size && buffer.pos < samples.size(); ++buffer.pos, ++i) {
for (int i = 0; i < max_size && buffer.pos < sample_count; ++buffer.pos, ++i) {
auto& mixed_sample = mixed_buffer[i];
mixed_sample += samples[buffer.pos];
}
// clear it later
if (buffer.pos == samples.size()) {
if (buffer.m_buffer_id && buffer.m_client) {
if (buffer.pos == sample_count) {
if (buffer.m_client) {
ASAPI_ServerMessage reply;
reply.type = ASAPI_ServerMessage::Type::FinishedPlayingBuffer;
reply.playing_buffer.buffer_id = buffer.m_buffer_id;
reply.playing_buffer.buffer_id = buffer.buffer->shared_buffer_id();
buffer.m_client->post_message(reply);
}
buffer.done = true;
@ -118,9 +119,8 @@ void ASMixer::mix()
}
}
ASMixer::ASMixerBuffer::ASMixerBuffer(const NonnullRefPtr<ABuffer>& buf, ASClientConnection& client, int buffer_id)
ASMixer::ASMixerBuffer::ASMixerBuffer(const NonnullRefPtr<ABuffer>& buf, ASClientConnection& client)
: buffer(buf)
, m_client(client.make_weak_ptr())
, m_buffer_id(buffer_id)
{
}