Skip to content

[OpenAL] Fix sourceSeek crash on stopped sources #26770

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
uniformization wants to merge 3 commits into
base: main
Choose a base branch
from
+18 −4
Open

[OpenAL] Fix sourceSeek crash on stopped sources #26770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7e5f797
Fix sourceSeek crash on stopped sources
uniformization Apr 24, 2026
723c98a
Add AL_SEC_OFFSET test for stopped sounds
uniformization Apr 25, 2026
d67e7d8
Add changes according the review
uniformization Apr 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/lib/libopenal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -724,9 +724,9 @@ var LibraryOpenAL = {
AL.setSourceState(src, {{{ cDefs.AL_INITIAL }}});
}

if (src.bufQueue[src.bufsProcessed].audioBuf !== null) {
src.bufsProcessed = 0;
while (offset > src.bufQueue[src.bufsProcessed].audioBuf.duration) {
src.bufsProcessed = 0;
if (src.bufQueue.length && src.bufQueue[0].audioBuf) {
while (src.bufsProcessed < src.bufQueue.length && offset > src.bufQueue[src.bufsProcessed].audioBuf.duration) {
offset -= src.bufQueue[src.bufsProcessed].audioBuf.duration;
src.bufsProcessed++;
}
Expand Down
12 changes: 11 additions & 1 deletion test/openal/test_openal_playback.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,11 @@ void playSource(void* arg) {
alSourceStop(source);
alGetSourcei(source, AL_SOURCE_STATE, &state);
assert(state == AL_STOPPED);
#ifdef TEST_STOPPED_SEEK
alSourcef(source, AL_SEC_OFFSET, 0.5f);
alGetSourcei(source, AL_SOURCE_STATE, &state);
assert(state == AL_STOPPED);
#endif
#endif

alSourceRewindv(1, &source);
Expand All @@ -69,6 +74,11 @@ void playSource(void* arg) {
alSourceStopv(1, &source);
alGetSourcei(source, AL_SOURCE_STATE, &state);
assert(state == AL_STOPPED);
#ifdef TEST_STOPPED_SEEK
alSourcef(source, AL_SEC_OFFSET, 0.5f);
alGetSourcei(source, AL_SOURCE_STATE, &state);
assert(state == AL_STOPPED);
Copy link
Copy Markdown
Collaborator

@sbc100 sbc100 Apr 25, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you confirm this new test fails without this patch?

Copy link
Copy Markdown
Author

@uniformization uniformization Apr 25, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let me know if the fix for this is good enough or if there's a better way of going about it. When an error is thrown from a function that was called with emscripten_async_call, it won't fail the test. (Line 306)

#endif
test_finished();
#endif
}
Expand Down Expand Up @@ -293,7 +303,7 @@ int main() {
printf("You should hear a short audio clip playing back.\n");
#endif

#ifdef __EMSCRIPTEN__
#if defined(__EMSCRIPTEN__) && !defined(TEST_STOPPED_SEEK)

intptr_t first_src = sources[0];
#if defined(TEST_LOOPED_PLAYBACK)
Expand Down
4 changes: 4 additions & 0 deletions test/test_interactive.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,10 @@ def test_openal_playback(self, args):
copy_asset('sounds/audio.wav')
self.btest('openal/test_openal_playback.c', '1', cflags=['-O2', '--preload-file', 'audio.wav'] + args)

def test_openal_stopped_seek_playback(self):
copy_asset('sounds/audio.wav')
self.btest('openal/test_openal_playback.c', '1', cflags=['-DTEST_STOPPED_SEEK=1', '-O2', '--preload-file', 'audio.wav'])

def test_openal_buffers(self):
self.btest_exit('openal/test_openal_buffers.c', cflags=['-DTEST_INTERACTIVE=1', '--preload-file', test_file('sounds/the_entertainer.wav') + '@/'])

Expand Down