bcd222cfae
It's currently possible to seek to the total sample count of an audio loader. We must limit seeking to one less than that count. This mistake was duplicated in both AudioCodecPluginSerenity/Ladybird, so the computation was moved to a helper in the base AudioCodecPlugin.
66 lines
2.4 KiB
C++
66 lines
2.4 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, size_t device_sample_rate)
|
|
{
|
|
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");
|
|
}
|
|
|
|
Audio::ResampleHelper<Audio::Sample> resampler(loader.sample_rate(), device_sample_rate);
|
|
return FixedArray<Audio::Sample>::create(resampler.resample(buffer_or_error.release_value()).span());
|
|
}
|
|
|
|
Duration AudioCodecPlugin::set_loader_position(Audio::Loader& loader, double position, Duration duration, size_t device_sample_rate)
|
|
{
|
|
if (loader.total_samples() == 0)
|
|
return current_loader_position(loader, device_sample_rate);
|
|
|
|
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, device_sample_rate);
|
|
}
|
|
|
|
Duration AudioCodecPlugin::current_loader_position(Audio::Loader const& loader, size_t device_sample_rate)
|
|
{
|
|
auto samples_played = static_cast<double>(loader.loaded_samples());
|
|
auto sample_rate = static_cast<double>(loader.sample_rate());
|
|
|
|
auto source_to_device_ratio = sample_rate / static_cast<double>(device_sample_rate);
|
|
samples_played *= source_to_device_ratio;
|
|
|
|
return Duration::from_milliseconds(static_cast<i64>(samples_played / sample_rate * 1000.0));
|
|
}
|
|
|
|
}
|