mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2024-09-20 09:49:15 +03:00
b4fbd30b70
This change was a long time in the making ever since we obtained sample rate awareness in the system. Now, each client has its own sample rate, accessible via new IPC APIs, and the device sample rate is only accessible via the management interface. AudioServer takes care of resampling client streams into the device sample rate. Therefore, the main improvement introduced with this commit is full responsiveness to sample rate changes; all open audio programs will continue to play at correct speed with the audio resampled to the new device rate. The immediate benefits are manifold: - Gets rid of the legacy hardware sample rate IPC message in the non-managing client - Removes duplicate resampling and sample index rescaling code everywhere - Avoids potential sample index scaling bugs in SoundPlayer (which have happened many times before) and fixes a sample index scaling bug in aplay - Removes several FIXMEs - Reduces amount of sample copying in all applications (especially Piano, where this is critical), improving performance - Reduces number of resampling users, making future API changes (which will need to happen for correct resampling to be implemented) easier I also threw in a simple race condition fix for Piano's audio player loop.
63 lines
2.0 KiB
C++
63 lines
2.0 KiB
C++
/*
|
|
* Copyright (c) 2023, Tim Flynn <trflynn89@serenityos.org>
|
|
*
|
|
* SPDX-License-Identifier: BSD-2-Clause
|
|
*/
|
|
|
|
#include <LibAudio/Loader.h>
|
|
#include <LibAudio/Resampler.h>
|
|
#include <LibAudio/Sample.h>
|
|
#include <LibWeb/Platform/AudioCodecPlugin.h>
|
|
|
|
namespace Web::Platform {
|
|
|
|
static AudioCodecPlugin::AudioCodecPluginCreator s_creation_hook;
|
|
|
|
AudioCodecPlugin::AudioCodecPlugin() = default;
|
|
AudioCodecPlugin::~AudioCodecPlugin() = default;
|
|
|
|
void AudioCodecPlugin::install_creation_hook(AudioCodecPluginCreator creation_hook)
|
|
{
|
|
VERIFY(!s_creation_hook);
|
|
s_creation_hook = move(creation_hook);
|
|
}
|
|
|
|
ErrorOr<NonnullOwnPtr<AudioCodecPlugin>> AudioCodecPlugin::create(NonnullRefPtr<Audio::Loader> loader)
|
|
{
|
|
VERIFY(s_creation_hook);
|
|
return s_creation_hook(move(loader));
|
|
}
|
|
|
|
ErrorOr<FixedArray<Audio::Sample>> AudioCodecPlugin::read_samples_from_loader(Audio::Loader& loader, size_t samples_to_load)
|
|
{
|
|
auto buffer_or_error = loader.get_more_samples(samples_to_load);
|
|
if (buffer_or_error.is_error()) {
|
|
dbgln("Error while loading samples: {}", buffer_or_error.error().description);
|
|
return Error::from_string_literal("Error while loading samples");
|
|
}
|
|
|
|
return buffer_or_error.release_value();
|
|
}
|
|
|
|
Duration AudioCodecPlugin::set_loader_position(Audio::Loader& loader, double position, Duration duration)
|
|
{
|
|
if (loader.total_samples() == 0)
|
|
return current_loader_position(loader);
|
|
|
|
auto duration_value = static_cast<double>(duration.to_milliseconds()) / 1000.0;
|
|
position = position / duration_value * static_cast<double>(loader.total_samples() - 1);
|
|
|
|
loader.seek(static_cast<int>(position)).release_value_but_fixme_should_propagate_errors();
|
|
return current_loader_position(loader);
|
|
}
|
|
|
|
Duration AudioCodecPlugin::current_loader_position(Audio::Loader const& loader)
|
|
{
|
|
auto samples_played = static_cast<double>(loader.loaded_samples());
|
|
auto sample_rate = static_cast<double>(loader.sample_rate());
|
|
|
|
return Duration::from_milliseconds(static_cast<i64>(samples_played / sample_rate * 1000.0));
|
|
}
|
|
|
|
}
|