Skip to content
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.

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

[3.x] instance audio streams before AudioServer::lock call #59413

Merged
merged 1 commit into from
Mar 31, 2022

Conversation

ellenhp
Copy link
Contributor

@ellenhp ellenhp commented Mar 22, 2022

Fixes #22016 in 3.x

This was fixed in master by #51296

The bug seems to be caused by an underrun due to the set_stream calls holding the global audio server lock during instancing of an ogg stream. It does seem like several different bugs may have been tracked by that issue at some point or another, but the only repro I have is caused by an underrun and this seems to fix it.

@ellenhp ellenhp closed this Mar 22, 2022
@ellenhp ellenhp reopened this Mar 22, 2022
@ellenhp ellenhp marked this pull request as ready for review March 22, 2022 13:16
@ellenhp ellenhp requested review from a team as code owners March 22, 2022 13:16
@ellenhp
Copy link
Contributor Author

ellenhp commented Mar 22, 2022

Closed by accident.

Copy link
Member

@akien-mga akien-mga left a comment

Choose a reason for hiding this comment

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

Approved by @reduz on chat, pending adding a comment which was added.

Also looks good to me.

@akien-mga akien-mga merged commit 5c0dcca into godotengine:3.x Mar 31, 2022
@akien-mga
Copy link
Member

Thanks!

@akien-mga
Copy link
Member

Cherry-picked for 3.4.5.

@ellenhp ellenhp deleted the preinstance-audio-streams branch April 21, 2022 20:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants