Merge pull request #659 from dumganhar/fix/android-audio-crash-sync

Sync cocos2d-x #17923:  [android] AudioEngine may crash while audio's over and stop state is triggered at the same time.
This commit is contained in:
Wang Nan
2017-06-16 16:17:31 +08:00
committed by GitHub
2 changed files with 26 additions and 11 deletions
@@ -23,6 +23,8 @@
****************************************************************************/
#if CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID
#define LOG_TAG "AudioEngineImpl"
#include "audio/android/AudioEngine-inl.h"
#include <unistd.h>
@@ -261,7 +263,7 @@ int AudioEngineImpl::play2d(const std::string &filePath ,bool loop ,float volume
player->setId(audioId);
_audioPlayers.insert(std::make_pair(audioId, player));
player->setPlayEventCallback([this, player](IAudioPlayer::State state){
player->setPlayEventCallback([this, player, filePath](IAudioPlayer::State state){
if (state != IAudioPlayer::State::OVER && state != IAudioPlayer::State::STOPPED)
{
@@ -270,12 +272,14 @@ int AudioEngineImpl::play2d(const std::string &filePath ,bool loop ,float volume
}
int id = player->getId();
std::string filePath = *AudioEngine::_audioIDInfoMap[id].filePath;
ALOGV("Removing player id=%d, state:%d", id, (int)state);
AudioEngine::remove(id);
_audioPlayers.erase(id);
if (_audioPlayers.find(id) != _audioPlayers.end())
{
_audioPlayers.erase(id);
}
auto iter = _callbackMap.find(id);
if (iter != _callbackMap.end())
+19 -8
View File
@@ -56,11 +56,22 @@ bool PcmAudioPlayer::prepare(const std::string &url, const PcmData &decResult)
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) {
// It maybe in sub thread
auto func = [this, state](){
Track::State prevState = _track->getPrevState();
auto func = [this, state, prevState](){
// It's in caller's thread
if (state == Track::State::OVER)
if (state == Track::State::OVER && prevState != Track::State::STOPPED)
{
if (_playEventCallback != nullptr)
{
@@ -81,11 +92,11 @@ bool PcmAudioPlayer::prepare(const std::string &url, const PcmData &decResult)
};
if (callerThreadId == std::this_thread::get_id())
{
{ // onStateChanged(Track::State::STOPPED) is in caller's (Cocos's) thread.
func();
}
else
{
{ // onStateChanged(Track::State::OVER) or onStateChanged(Track::State::DESTROYED) are in audio mixing thread.
_callerThreadUtils->performFunctionInCallerThread(func);
}
};
@@ -148,26 +159,26 @@ void PcmAudioPlayer::setPlayEventCallback(const PlayEventCallback &playEventCall
void PcmAudioPlayer::play()
{
// put track to AudioMixerController
ALOGV("PcmAudioPlayer (%p) play (%s) ...", this, _url.c_str());
ALOGV("PcmAudioPlayer (%p) play, url: %s", this, _url.c_str());
_controller->addTrack(_track);
_track->setState(Track::State::PLAYING);
}
void PcmAudioPlayer::pause()
{
ALOGV("PcmAudioPlayer (%p) pause ...", this);
ALOGV("PcmAudioPlayer (%p) pause, url: %s", this, _url.c_str());
_track->setState(Track::State::PAUSED);
}
void PcmAudioPlayer::resume()
{
ALOGV("PcmAudioPlayer (%p) resume ...", this);
ALOGV("PcmAudioPlayer (%p) resume, url: %s", this, _url.c_str());
_track->setState(Track::State::RESUMED);
}
void PcmAudioPlayer::stop()
{
ALOGV("PcmAudioPlayer (%p) stop ...", this);
ALOGV("PcmAudioPlayer (%p) stop, url: %s", this, _url.c_str());
_track->setState(Track::State::STOPPED);
}