Skip to content

android: avoid OpenSL mixer lock recursion #301

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

Closed
kumagi wants to merge 1 commit into from
Closed

android: avoid OpenSL mixer lock recursion #301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 4 additions & 2 deletions internal/oboe/oboe_opensles_OutputMixerOpenSLES_android.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,17 @@ SLresult OutputMixerOpenSL::open() {
return result;

error:
close();
closeLocked();
return result;
}

void OutputMixerOpenSL::close() {
std::lock_guard<std::mutex> lock(mLock);
closeLocked();
}

void OutputMixerOpenSL::closeLocked() {
if (--mOpenCount == 0) {
// destroy output mix object, and invalidate all associated interfaces
if (mOutputMixObject != nullptr) {
(*mOutputMixObject)->Destroy(mOutputMixObject);
mOutputMixObject = nullptr;
Expand Down
2 changes: 2 additions & 0 deletions internal/oboe/oboe_opensles_OutputMixerOpenSLES_android.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ class OutputMixerOpenSL {
SLDataSource *audioSource);

private:
void closeLocked();

// Make this a safe Singleton
OutputMixerOpenSL()= default;
~OutputMixerOpenSL()= default;
Expand Down
Loading