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

AudioServer+LibAudio: Pass audio buffers as Core::AnonymousBuffer

Browse source 
This was the last remaining user of shbufs! :^)
This commit is contained in:
Andreas Kling 2021-01-17 08:43:58 +01:00
parent cc8b3c92ba
commit 2cd16778b5
9 changed files with 36 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Userland/Libraries/LibAudio/Buffer.cpp
View file

@ -24,10 +24,17 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <AK/Atomic.h>
#include <LibAudio/Buffer.h>
namespace Audio {
i32 Buffer::allocate_id()
{
static Atomic<i32> next_id;
return next_id++;
}
template<typename SampleReader>
static void read_samples_from_stream(InputMemoryStream& stream, SampleReader read_sample, Vector<Sample>& samples, ResampleHelper& resampler, int num_channels)
{

27
Userland/Libraries/LibAudio/Buffer.h
View file

@ -28,9 +28,9 @@
#include <AK/ByteBuffer.h>
#include <AK/MemoryStream.h>
#include <AK/SharedBuffer.h>
#include <AK/Types.h>
#include <AK/Vector.h>
#include <LibCore/AnonymousBuffer.h>
#include <string.h>
namespace Audio {
@ -115,33 +115,38 @@ public:
{
return adopt(*new Buffer(move(samples)));
}
static NonnullRefPtr<Buffer> create_with_shared_buffer(NonnullRefPtr<SharedBuffer>&& buffer, int sample_count)
static NonnullRefPtr<Buffer> create_with_anonymous_buffer(Core::AnonymousBuffer buffer, i32 buffer_id, int sample_count)
{
return adopt(*new Buffer(move(buffer), sample_count));
return adopt(*new Buffer(move(buffer), buffer_id, sample_count));
}
const Sample* samples() const { return (const Sample*)data(); }
int sample_count() const { return m_sample_count; }
const void* data() const { return m_buffer->data<void>(); }
const void* data() const { return m_buffer.data<void>(); }
int size_in_bytes() const { return m_sample_count * (int)sizeof(Sample); }
int shbuf_id() const { return m_buffer->shbuf_id(); }
SharedBuffer& shared_buffer() { return *m_buffer; }
int id() const { return m_id; }
const Core::AnonymousBuffer& anonymous_buffer() const { return m_buffer; }
private:
explicit Buffer(Vector<Sample>&& samples)
: m_buffer(*SharedBuffer::create_with_size(samples.size() * sizeof(Sample)))
explicit Buffer(const Vector<Sample> samples)
: m_buffer(Core::AnonymousBuffer::create_with_size(samples.size() * sizeof(Sample)))
, m_id(allocate_id())
, m_sample_count(samples.size())
{
memcpy(m_buffer->data<void>(), samples.data(), samples.size() * sizeof(Sample));
memcpy(m_buffer.data<void>(), samples.data(), samples.size() * sizeof(Sample));
}
explicit Buffer(NonnullRefPtr<SharedBuffer>&& buffer, int sample_count)
explicit Buffer(Core::AnonymousBuffer buffer, i32 buffer_id, int sample_count)
: m_buffer(move(buffer))
, m_id(buffer_id)
, m_sample_count(sample_count)
{
}
NonnullRefPtr<SharedBuffer> m_buffer;
static i32 allocate_id();
Core::AnonymousBuffer m_buffer;
const i32 m_id;
const int m_sample_count;
};

6
Userland/Libraries/LibAudio/ClientConnection.cpp
View file

@ -43,8 +43,7 @@ void ClientConnection::handshake()
void ClientConnection::enqueue(const Buffer& buffer)
{
for (;;) {
const_cast<Buffer&>(buffer).shared_buffer().share_with(server_pid());
auto response = send_sync<Messages::AudioServer::EnqueueBuffer>(buffer.shbuf_id(), buffer.sample_count());
auto response = send_sync<Messages::AudioServer::EnqueueBuffer>(buffer.anonymous_buffer(), buffer.id(), buffer.sample_count());
if (response->success())
break;
sleep(1);
@ -53,8 +52,7 @@ void ClientConnection::enqueue(const Buffer& buffer)
bool ClientConnection::try_enqueue(const Buffer& buffer)
{
const_cast<Buffer&>(buffer).shared_buffer().share_with(server_pid());
auto response = send_sync<Messages::AudioServer::EnqueueBuffer>(buffer.shbuf_id(), buffer.sample_count());
auto response = send_sync<Messages::AudioServer::EnqueueBuffer>(buffer.anonymous_buffer(), buffer.id(), buffer.sample_count());
return response->success();
}