mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2024-11-11 01:06:01 +03:00
49b087f3cd
Previously, we were sending Buffers to the server whenever we had new audio data for it. This meant that for every audio enqueue action, we needed to create a new shared memory anonymous buffer, send that buffer's file descriptor over IPC (+recfd on the other side) and then map the buffer into the audio server's memory to be able to play it. This was fine for sending large chunks of audio data, like when playing existing audio files. However, in the future we want to move to real-time audio in some applications like Piano. This means that the size of buffers that are sent need to be very small, as just the size of a buffer itself is part of the audio latency. If we were to try real-time audio with the existing system, we would run into problems really quickly. Dealing with a continuous stream of new anonymous files like the current audio system is rather expensive, as we need Kernel help in multiple places. Additionally, every enqueue incurs an IPC call, which are not optimized for >1000 calls/second (which would be needed for real-time audio with buffer sizes of ~40 samples). So a fundamental change in how we handle audio sending in userspace is necessary. This commit moves the audio sending system onto a shared single producer circular queue (SSPCQ) (introduced with one of the previous commits). This queue is intended to live in shared memory and be accessed by multiple processes at the same time. It was specifically written to support the audio sending case, so e.g. it only supports a single producer (the audio client). Now, audio sending follows these general steps: - The audio client connects to the audio server. - The audio client creates a SSPCQ in shared memory. - The audio client sends the SSPCQ's file descriptor to the audio server with the set_buffer() IPC call. - The audio server receives the SSPCQ and maps it. - The audio client signals start of playback with start_playback(). - At the same time: - The audio client writes its audio data into the shared-memory queue. - The audio server reads audio data from the shared-memory queue(s). Both sides have additional before-queue/after-queue buffers, depending on the exact application. - Pausing playback is just an IPC call, nothing happens to the buffer except that the server stops reading from it until playback is resumed. - Muting has nothing to do with whether audio data is read or not. - When the connection closes, the queues are unmapped on both sides. This should already improve audio playback performance in a bunch of places. Implementation & commit notes: - Audio loaders don't create LegacyBuffers anymore. LegacyBuffer is kept for WavLoader, see previous commit message. - Most intra-process audio data passing is done with FixedArray<Sample> or Vector<Sample>. - Improvements to most audio-enqueuing applications. (If necessary I can try to extract some of the aplay improvements.) - New APIs on LibAudio/ClientConnection which allows non-realtime applications to enqueue audio in big chunks like before. - Removal of status APIs from the audio server connection for information that can be directly obtained from the shared queue. - Split the pause playback API into two APIs with more intuitive names. I know this is a large commit, and you can kinda tell from the commit message. It's basically impossible to break this up without hacks, so please forgive me. These are some of the best changes to the audio subsystem and I hope that that makes up for this :yaktangle: commit. :yakring:
73 lines
2.8 KiB
C++
73 lines
2.8 KiB
C++
/*
|
|
* Copyright (c) 2021, the SerenityOS developers.
|
|
*
|
|
* SPDX-License-Identifier: BSD-2-Clause
|
|
*/
|
|
|
|
#include <AK/NumericLimits.h>
|
|
#include <AK/Types.h>
|
|
#include <LibAudio/Loader.h>
|
|
#include <LibCore/ArgsParser.h>
|
|
#include <LibCore/ElapsedTimer.h>
|
|
#include <LibCore/File.h>
|
|
#include <LibCore/System.h>
|
|
#include <LibMain/Main.h>
|
|
#include <stdio.h>
|
|
|
|
// The Kernel has problems with large anonymous buffers, so let's limit sample reads ourselves.
|
|
static constexpr size_t MAX_CHUNK_SIZE = 1 * MiB / 2;
|
|
|
|
ErrorOr<int> serenity_main(Main::Arguments args)
|
|
{
|
|
char const* path = nullptr;
|
|
int sample_count = -1;
|
|
|
|
Core::ArgsParser args_parser;
|
|
args_parser.set_general_help("Benchmark audio loading");
|
|
args_parser.add_positional_argument(path, "Path to audio file", "path");
|
|
args_parser.add_option(sample_count, "How many samples to load at maximum", "sample-count", 's', "samples");
|
|
args_parser.parse(args);
|
|
|
|
TRY(Core::System::unveil(Core::File::absolute_path(path), "r"));
|
|
TRY(Core::System::unveil(nullptr, nullptr));
|
|
TRY(Core::System::pledge("stdio recvfd rpath"));
|
|
|
|
auto maybe_loader = Audio::Loader::create(path);
|
|
if (maybe_loader.is_error()) {
|
|
warnln("Failed to load audio file: {}", maybe_loader.error().description);
|
|
return 1;
|
|
}
|
|
auto loader = maybe_loader.release_value();
|
|
|
|
Core::ElapsedTimer sample_timer { true };
|
|
u64 total_loader_time = 0;
|
|
int remaining_samples = sample_count > 0 ? sample_count : NumericLimits<int>::max();
|
|
unsigned total_loaded_samples = 0;
|
|
|
|
for (;;) {
|
|
if (remaining_samples > 0) {
|
|
sample_timer = sample_timer.start_new();
|
|
auto samples = loader->get_more_samples(min(MAX_CHUNK_SIZE, remaining_samples));
|
|
auto elapsed = static_cast<u64>(sample_timer.elapsed());
|
|
total_loader_time += static_cast<u64>(elapsed);
|
|
if (!samples.is_error()) {
|
|
remaining_samples -= samples.value().size();
|
|
total_loaded_samples += samples.value().size();
|
|
if (samples.value().size() == 0)
|
|
break;
|
|
} else {
|
|
warnln("Error while loading audio: {}", samples.error().description);
|
|
return 1;
|
|
}
|
|
} else
|
|
break;
|
|
}
|
|
|
|
auto time_per_sample = static_cast<double>(total_loader_time) / static_cast<double>(total_loaded_samples) * 1000.;
|
|
auto playback_time_per_sample = (1. / static_cast<double>(loader->sample_rate())) * 1000'000.;
|
|
|
|
outln("Loaded {:10d} samples in {:06.3f} s, {:9.3f} µs/sample, {:6.1f}% speed (realtime {:9.3f} µs/sample)", total_loaded_samples, static_cast<double>(total_loader_time) / 1000., time_per_sample, playback_time_per_sample / time_per_sample * 100., playback_time_per_sample);
|
|
|
|
return 0;
|
|
}
|