Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[android] Audio Engine crash on Android when playing and stopping some audios repeatedly. (#17748)

This commit is contained in:
James Chen 2017-04-27 09:48:13 +08:00 committed by minggo
parent f8e325792b
commit 77f2f82b7a
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cocos/audio/android/PcmAudioPlayer.cpp
View File

@ -56,11 +56,21 @@ bool PcmAudioPlayer::prepare(const std::string &url, const PcmData &decResult)
std::thread::id callerThreadId = _callerThreadUtils->getCallerThreadId(); std::thread::id callerThreadId = _callerThreadUtils->getCallerThreadId();
// @note The logic may cause this issue https://github.com/cocos2d/cocos2d-x/issues/17707
// Assume that AudioEngine::stop(id) is invoked and the audio is played over meanwhile.
// Since State::OVER and State::DESTROYED are triggered in the audio mixing thread, it will
// call 'performFunctionInCallerThread' to post events to cocos's message queue.
// Therefore, the sequence in cocos's thread will be |STOP|OVER|DESTROYED|.
// Although, we remove the audio id in |STOPPED| callback, because it's asynchronous operation,
// |OVER| and |DESTROYED| callbacks will still be invoked in cocos's thread.
// HOW TO FIX: If the previous state is |STOPPED| and the current state
// is |OVER|, just skip to invoke |OVER| callback.
_track->onStateChanged = [this, callerThreadId](Track::State state) { _track->onStateChanged = [this, callerThreadId](Track::State state) {
// It maybe in sub thread // It maybe in sub thread
auto func = [this, state](){ auto func = [this, state](){
// It's in caller's thread // It's in caller's thread
if (state == Track::State::OVER) if (state == Track::State::OVER && _track->getPrevState() != Track::State::STOPPED)
{ {
if (_playEventCallback != nullptr) if (_playEventCallback != nullptr)
{ {
@ -81,11 +91,11 @@ bool PcmAudioPlayer::prepare(const std::string &url, const PcmData &decResult)
}; };
if (callerThreadId == std::this_thread::get_id()) if (callerThreadId == std::this_thread::get_id())
{ { // onStateChanged(Track::State::STOPPED) is in caller's (Cocos's) thread.
func(); func();
} }
else else
{ { // onStateChanged(Track::State::OVER) or onStateChanged(Track::State::DESTROYED) are in audio mixing thread.
_callerThreadUtils->performFunctionInCallerThread(func); _callerThreadUtils->performFunctionInCallerThread(func);
} }
}; };