mirrors/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-12-05 01:10:24 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

LibMedia: Only set data provider error state from the decoding thread

Browse Source 
...and use that assumption to avoid locking when checking if we're in
that state.
This commit is contained in:
Zaggy1024
2025-11-28 17:43:28 -06:00
committed by Gregory Bertilson
parent 2bd541c70c
commit bd1c9aedbc
Notes: github-actions[bot] 2025-12-03 18:22:00 +00:00 
Author: https://github.com/Zaggy1024
Commit: https://github.com/LadybirdBrowser/ladybird/commit/bd1c9aedbca
Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/6971
2 changed files with 4 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Libraries/LibMedia/Providers/AudioDataProvider.cpp
View File

@@ -154,12 +154,8 @@ void AudioDataProvider::ThreadData::process_seek_on_main_thread(u32 seek_id, T&&
void AudioDataProvider::ThreadData::resolve_seek(u32 seek_id) void AudioDataProvider::ThreadData::resolve_seek(u32 seek_id)
{ {
m_is_in_error_state = false;
process_seek_on_main_thread(seek_id, [self = NonnullRefPtr(*this)] { process_seek_on_main_thread(seek_id, [self = NonnullRefPtr(*this)] {
{
auto locker = self->take_lock();
self->m_is_in_error_state = false;
self->wake();
}
auto handler = move(self->m_seek_completion_handler); auto handler = move(self->m_seek_completion_handler);
if (handler) if (handler)
handler(); handler();
@@ -173,11 +169,11 @@ bool AudioDataProvider::ThreadData::handle_seek()
return false; return false;
auto handle_error = [&](DecoderError&& error) { auto handle_error = [&](DecoderError&& error) {
m_is_in_error_state = true;
{ {
auto locker = take_lock(); auto locker = take_lock();
m_queue.clear(); m_queue.clear();
} }
process_seek_on_main_thread(seek_id, process_seek_on_main_thread(seek_id,
[self = NonnullRefPtr(*this), error = move(error)] mutable { [self = NonnullRefPtr(*this), error = move(error)] mutable {
if (self->m_error_handler) if (self->m_error_handler)
@@ -266,8 +262,6 @@ bool AudioDataProvider::ThreadData::handle_seek()
void AudioDataProvider::ThreadData::push_data_and_decode_a_block() void AudioDataProvider::ThreadData::push_data_and_decode_a_block()
{ {
auto set_error_and_wait_for_seek = [this](DecoderError&& error) { auto set_error_and_wait_for_seek = [this](DecoderError&& error) {
auto is_in_error_state = true;
{ {
auto locker = take_lock(); auto locker = take_lock();
m_is_in_error_state = true; m_is_in_error_state = true;
@@ -278,14 +272,12 @@ void AudioDataProvider::ThreadData::push_data_and_decode_a_block()
} }
dbgln_if(PLAYBACK_MANAGER_DEBUG, "Audio Data Provider: Encountered an error, waiting for a seek to start decoding again..."); dbgln_if(PLAYBACK_MANAGER_DEBUG, "Audio Data Provider: Encountered an error, waiting for a seek to start decoding again...");
while (is_in_error_state) { while (m_is_in_error_state) {
if (handle_seek()) if (handle_seek())
break; break;
{ {
auto locker = take_lock(); auto locker = take_lock();
m_wait_condition.wait(); m_wait_condition.wait();
is_in_error_state = m_is_in_error_state;
} }
} }
}; };

6
Libraries/LibMedia/Providers/VideoDataProvider.cpp
View File

@@ -361,8 +361,6 @@ void VideoDataProvider::ThreadData::push_data_and_decode_some_frames()
// before this functionality can exist. // before this functionality can exist.
auto set_error_and_wait_for_seek = [this](DecoderError&& error) { auto set_error_and_wait_for_seek = [this](DecoderError&& error) {
auto is_in_error_state = true;
{ {
auto locker = take_lock(); auto locker = take_lock();
m_is_in_error_state = true; m_is_in_error_state = true;
@@ -373,14 +371,12 @@ void VideoDataProvider::ThreadData::push_data_and_decode_some_frames()
} }
dbgln_if(PLAYBACK_MANAGER_DEBUG, "Video Data Provider: Encountered an error, waiting for a seek to start decoding again..."); dbgln_if(PLAYBACK_MANAGER_DEBUG, "Video Data Provider: Encountered an error, waiting for a seek to start decoding again...");
while (is_in_error_state) { while (m_is_in_error_state) {
if (handle_seek()) if (handle_seek())
break; break;
{ {
auto locker = take_lock(); auto locker = take_lock();
m_wait_condition.wait(); m_wait_condition.wait();
is_in_error_state = m_is_in_error_state;
} }
} }
}; };