OSSForks/ladybird
1
0
Fork 0
mirror of https://github.com/zebrajr/ladybird.git synced 2025-12-06 12:20:00 +01:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

LibMedia+LibWeb: Never return errors when getting PlaybackStream time

Browse Source 
We should be fine to just fall back to zero or the last returned value
if we encounter an error in PlaybackStream::total_time_played(), and
this also simplifies the using code.
This commit is contained in:
Zaggy1024 2025-09-25 13:44:38 -05:00 committed by Jelle Raaijmakers
parent 9da723b5c6
commit 27742ef26d
11 changed files with 23 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Libraries/LibMedia/Audio/PlaybackStream.h
View File

@ -63,7 +63,7 @@ public:
// whenever possible.
//
// This function should be able to run from any thread safely.
virtual ErrorOr<AK::Duration> total_time_played() = 0;
virtual AK::Duration total_time_played() const = 0;
virtual NonnullRefPtr<Core::ThreadedPromise<void>> set_volume(double volume) = 0;
};

2
Libraries/LibMedia/Audio/PlaybackStreamAudioUnit.cpp
View File

@ -281,7 +281,7 @@ NonnullRefPtr<Core::ThreadedPromise<void>> PlaybackStreamAudioUnit::discard_buff
return promise;
}
ErrorOr<AK::Duration> PlaybackStreamAudioUnit::total_time_played()
AK::Duration PlaybackStreamAudioUnit::total_time_played() const
{
return m_state->last_sample_time();
}

2
Libraries/LibMedia/Audio/PlaybackStreamAudioUnit.h
View File

@ -25,7 +25,7 @@ public:
virtual NonnullRefPtr<Core::ThreadedPromise<void>> drain_buffer_and_suspend() override;
virtual NonnullRefPtr<Core::ThreadedPromise<void>> discard_buffer_and_suspend() override;
virtual ErrorOr<AK::Duration> total_time_played() override;
virtual AK::Duration total_time_played() const override;
virtual NonnullRefPtr<Core::ThreadedPromise<void>> set_volume(double) override;

4
Libraries/LibMedia/Audio/PlaybackStreamOboe.cpp
View File

@ -123,7 +123,7 @@ void PlaybackStreamOboe::set_underrun_callback(Function<void()>)
NonnullRefPtr<Core::ThreadedPromise<AK::Duration>> PlaybackStreamOboe::resume()
{
auto promise = Core::ThreadedPromise<AK::Duration>::create();
auto time = MUST(total_time_played());
auto time = total_time_played();
m_storage->stream()->start();
promise->resolve(move(time));
return promise;
@ -146,7 +146,7 @@ NonnullRefPtr<Core::ThreadedPromise<void>> PlaybackStreamOboe::discard_buffer_an
return promise;
}
ErrorOr<AK::Duration> PlaybackStreamOboe::total_time_played()
AK::Duration PlaybackStreamOboe::total_time_played() const
{
return m_storage->oboe_callback()->last_sample_time();
}

2
Libraries/LibMedia/Audio/PlaybackStreamOboe.h
View File

@ -22,7 +22,7 @@ public:
virtual NonnullRefPtr<Core::ThreadedPromise<void>> drain_buffer_and_suspend() override;
virtual NonnullRefPtr<Core::ThreadedPromise<void>> discard_buffer_and_suspend() override;
virtual ErrorOr<AK::Duration> total_time_played() override;
virtual AK::Duration total_time_played() const override;
virtual NonnullRefPtr<Core::ThreadedPromise<void>> set_volume(double) override;

4
Libraries/LibMedia/Audio/PlaybackStreamPulseAudio.cpp
View File

@ -89,7 +89,7 @@ NonnullRefPtr<Core::ThreadedPromise<AK::Duration>> PlaybackStreamPulseAudio::res
TRY_OR_REJECT(m_state->check_is_running(), promise);
m_state->enqueue([this, promise]() {
TRY_OR_REJECT(m_state->stream()->resume());
promise->resolve(TRY_OR_REJECT(m_state->stream()->total_time_played()));
promise->resolve(m_state->stream()->total_time_played());
});
return promise;
}
@ -116,7 +116,7 @@ NonnullRefPtr<Core::ThreadedPromise<void>> PlaybackStreamPulseAudio::discard_buf
return promise;
}
ErrorOr<AK::Duration> PlaybackStreamPulseAudio::total_time_played()
AK::Duration PlaybackStreamPulseAudio::total_time_played() const
{
if (m_state->stream() != nullptr)
return m_state->stream()->total_time_played();

2
Libraries/LibMedia/Audio/PlaybackStreamPulseAudio.h
View File

@ -25,7 +25,7 @@ public:
virtual NonnullRefPtr<Core::ThreadedPromise<void>> drain_buffer_and_suspend() override;
virtual NonnullRefPtr<Core::ThreadedPromise<void>> discard_buffer_and_suspend() override;
virtual ErrorOr<AK::Duration> total_time_played() override;
virtual AK::Duration total_time_played() const override;
virtual NonnullRefPtr<Core::ThreadedPromise<void>> set_volume(double) override;

12
Libraries/LibMedia/Audio/PulseAudioWrappers.cpp
View File

@ -232,7 +232,7 @@ ErrorOr<NonnullRefPtr<PulseAudioStream>> PulseAudioContext::create_stream(Output
flags = static_cast<pa_stream_flags>(static_cast<u32>(flags) | PA_STREAM_START_CORKED);
}
// This is a workaround for an issue with starting the stream corked, see PulseAudioPlaybackStream::total_time_played().
// This is a workaround for an issue with starting the stream corked, see PulseAudioStream::total_time_played().
pa_stream_set_started_callback(
stream, [](pa_stream* stream, void* user_data) {
static_cast<PulseAudioStream*>(user_data)->m_started_playback = true;
@ -455,7 +455,7 @@ ErrorOr<void> PulseAudioStream::resume()
return {};
}
ErrorOr<AK::Duration> PulseAudioStream::total_time_played()
AK::Duration PulseAudioStream::total_time_played() const
{
auto locker = m_context->main_loop_locker();
@ -472,10 +472,12 @@ ErrorOr<AK::Duration> PulseAudioStream::total_time_played()
pa_usec_t time = 0;
auto error = pa_stream_get_time(m_stream, &time);
if (error == -PA_ERR_NODATA)
if (error)
return AK::Duration::zero();
if (error != 0)
return Error::from_string_literal("Failed to get time from PulseAudio stream");
if (error != 0) {
warnln("Unexpected error in pa_stream_get_time(): {}", error);
return AK::Duration::zero();
}
if (time > NumericLimits<i64>::max()) {
warnln("WARNING: Audio time is too large!");
time -= NumericLimits<i64>::max();

2
Libraries/LibMedia/Audio/PulseAudioWrappers.h
View File

@ -117,7 +117,7 @@ public:
// Uncorks the stream and forces data to be written to the buffers to force playback to
// resume as soon as possible.
ErrorOr<void> resume();
ErrorOr<AK::Duration> total_time_played();
AK::Duration total_time_played() const;
ErrorOr<void> set_volume(double volume);

17
Libraries/LibWeb/Platform/AudioCodecPluginAgnostic.cpp
View File

@ -68,7 +68,7 @@ ErrorOr<NonnullOwnPtr<AudioCodecPluginAgnostic>> AudioCodecPluginAgnostic::creat
}));
output->set_underrun_callback([&plugin = *plugin, loader, output]() {
auto new_device_time = output->total_time_played().release_value_but_fixme_should_propagate_errors();
auto new_device_time = output->total_time_played();
auto new_media_time = timestamp_from_samples(loader->loaded_samples(), loader->sample_rate());
plugin.m_main_thread_event_loop.deferred_invoke([&plugin, new_device_time, new_media_time]() {
plugin.m_last_resume_in_device_time = new_device_time;
@ -118,12 +118,12 @@ void AudioCodecPluginAgnostic::pause_playback()
{
m_paused = true;
m_output->drain_buffer_and_suspend()
->when_resolved([self = make_weak_ptr<AudioCodecPluginAgnostic>()]() -> ErrorOr<void> {
->when_resolved([self = make_weak_ptr<AudioCodecPluginAgnostic>()]() {
if (!self)
return {};
return;
auto new_media_time = timestamp_from_samples(self->m_loader->loaded_samples(), self->m_loader->sample_rate());
auto new_device_time = TRY(self->m_output->total_time_played());
auto new_device_time = self->m_output->total_time_played();
self->m_main_thread_event_loop.deferred_invoke([self, new_media_time, new_device_time]() {
if (!self)
@ -134,8 +134,6 @@ void AudioCodecPluginAgnostic::pause_playback()
self->m_update_timer->stop();
self->update_timestamp();
});
return {};
})
.when_rejected([](Error&&) {
// FIXME: Propagate errors.
@ -162,7 +160,7 @@ void AudioCodecPluginAgnostic::seek(double position)
return Error::from_string_literal("Seeking in audio loader failed");
auto new_media_time = get_loader_timestamp(self->m_loader);
auto new_device_time = self->m_output->total_time_played().release_value_but_fixme_should_propagate_errors();
auto new_device_time = self->m_output->total_time_played();
self->m_main_thread_event_loop.deferred_invoke([self, was_paused, new_device_time, new_media_time]() {
if (!self)
@ -194,10 +192,7 @@ AK::Duration AudioCodecPluginAgnostic::duration()
void AudioCodecPluginAgnostic::update_timestamp()
{
auto current_device_time_result = m_output->total_time_played();
if (!current_device_time_result.is_error())
m_last_good_device_time = current_device_time_result.release_value();
auto current_device_time_delta = m_last_good_device_time - m_last_resume_in_device_time;
auto current_device_time_delta = m_output->total_time_played() - m_last_resume_in_device_time;
auto current_media_time = m_last_resume_in_media_time + current_device_time_delta;
current_media_time = min(current_media_time, m_duration);

1
Libraries/LibWeb/Platform/AudioCodecPluginAgnostic.h
View File

@ -34,7 +34,6 @@ private:
AK::Duration m_duration { AK::Duration::zero() };
AK::Duration m_last_resume_in_media_time { AK::Duration::zero() };
AK::Duration m_last_resume_in_device_time { AK::Duration::zero() };
AK::Duration m_last_good_device_time { AK::Duration::zero() };
Core::EventLoop& m_main_thread_event_loop;
NonnullRefPtr<Core::Timer> m_update_timer;
bool m_paused { true };