Fixes crash while invoking pause&resume right after play2d. (#16406)

cocos/audio/android/AudioMixerController.cpp

@@ -96,49 +96,7 @@ static void removeItemFromVector(std::vector<T>& v, T item)
     }
 }
 
-void AudioMixerController::mixOneFrame()
+void AudioMixerController::initTrack(Track* track, std::vector<Track*>& tracksToRemove)
-{
-    _isMixingFrame = true;
-    _activeTracksMutex.lock();
-
-    auto mixStart = clockNow();
-
-    std::vector<Track*> tracksToRemove;
-    tracksToRemove.reserve(_activeTracks.size());
-
-    // FOR TESTING BEGIN
-//        Track* track = _activeTracks[0];
-//
-//        AudioBufferProvider::Buffer buffer;
-//        buffer.frameCount = _bufferSizeInFrames;
-//        status_t r = track->getNextBuffer(&buffer);
-////        ALOG_ASSERT(buffer.frameCount == _mixing->size / 2, "buffer.frameCount:%d, _mixing->size/2:%d", buffer.frameCount, _mixing->size/2);
-//        if (r == NO_ERROR)
-//        {
-//            ALOGV("getNextBuffer succeed ...");
-//            memcpy(_mixing->buf, buffer.raw, _mixing->size);
-//        }
-//        if (buffer.raw == nullptr)
-//        {
-//            ALOGV("Play over ...");
-//            tracksToRemove.push_back(track);
-//        }
-//        else
-//        {
-//            track->releaseBuffer(&buffer);
-//        }
-//
-//        _mixing->state = BufferState::FULL;
-//        _activeTracksMutex.unlock();
-    // FOR TESTING END
-
-    Track::State state;
-    // set up the tracks.
-    for (auto&& track : _activeTracks)
-    {
-        state = track->getState();
-
-        if (state == Track::State::IDLE)
 {
     uint32_t channelMask = audio_channel_out_mask_from_count(2);
     int32_t name = _mixer->getTrackName(channelMask, AUDIO_FORMAT_PCM_16_BIT,
@@ -188,12 +146,65 @@ void AudioMixerController::mixOneFrame()
         _mixer->setParameter(name, AudioMixer::VOLUME, AudioMixer::VOLUME1, &rVolume);
 
         track->setVolumeDirty(false);
+        track->setInitialized(true);
     }
 }
+
+void AudioMixerController::mixOneFrame()
+{
+    _isMixingFrame = true;
+    _activeTracksMutex.lock();
+
+    auto mixStart = clockNow();
+
+    std::vector<Track*> tracksToRemove;
+    tracksToRemove.reserve(_activeTracks.size());
+
+    // FOR TESTING BEGIN
+//        Track* track = _activeTracks[0];
+//
+//        AudioBufferProvider::Buffer buffer;
+//        buffer.frameCount = _bufferSizeInFrames;
+//        status_t r = track->getNextBuffer(&buffer);
+////        ALOG_ASSERT(buffer.frameCount == _mixing->size / 2, "buffer.frameCount:%d, _mixing->size/2:%d", buffer.frameCount, _mixing->size/2);
+//        if (r == NO_ERROR)
+//        {
+//            ALOGV("getNextBuffer succeed ...");
+//            memcpy(_mixing->buf, buffer.raw, _mixing->size);
+//        }
+//        if (buffer.raw == nullptr)
+//        {
+//            ALOGV("Play over ...");
+//            tracksToRemove.push_back(track);
+//        }
+//        else
+//        {
+//            track->releaseBuffer(&buffer);
+//        }
+//
+//        _mixing->state = BufferState::FULL;
+//        _activeTracksMutex.unlock();
+    // FOR TESTING END
+
+    Track::State state;
+    // set up the tracks.
+    for (auto&& track : _activeTracks)
+    {
+        state = track->getState();
+
+        if (state == Track::State::IDLE)
+        {
+            initTrack(track, tracksToRemove);
+        }
         else if (state == Track::State::PLAYING)
         {
-            ALOG_ASSERT(track->getName() >= 0);
+            if (!track->isInitialized())
+            {
+                initTrack(track, tracksToRemove);
+            }
+
             int name = track->getName();
+            ALOG_ASSERT(name >= 0);
 
             std::lock_guard<std::mutex> lk(track->_volumeDirtyMutex);
 
@@ -213,6 +224,11 @@ void AudioMixerController::mixOneFrame()
         }
         else if (state == Track::State::RESUMED)
         {
+            if (!track->isInitialized())
+            {
+                initTrack(track, tracksToRemove);
+            }
+
             if (track->getPrevState() == Track::State::PAUSED)
             {
                 _mixer->enable(track->getName());
@@ -220,21 +236,28 @@ void AudioMixerController::mixOneFrame()
             }
             else
             {
-                ALOGW("Previous state (%d) isn't PAUSED, couldn't resume!", track->getPrevState());
+                ALOGW("Previous state (%d) isn't PAUSED, couldn't resume!", static_cast<int>(track->getPrevState()));
             }
         }
         else if (state == Track::State::PAUSED)
         {
+            if (!track->isInitialized())
+            {
+                initTrack(track, tracksToRemove);
+            }
+
             if (track->getPrevState() == Track::State::PLAYING || track->getPrevState() == Track::State::RESUMED)
             {
                 _mixer->disable(track->getName());
             }
             else
             {
-                ALOGW("Previous state (%d) isn't PLAYING, couldn't pause!", track->getPrevState());
+                ALOGW("Previous state (%d) isn't PLAYING, couldn't pause!", static_cast<int>(track->getPrevState()));
             }
         }
         else if (state == Track::State::STOPPED)
+        {
+            if (track->isInitialized())
             {
                 if (track->getPrevState() != Track::State::IDLE)
                 {
@@ -244,6 +267,11 @@ void AudioMixerController::mixOneFrame()
                 {
                     ALOGV("Stop track (%p) while it's in IDLE state!", track);
                 }
+            }
+            else
+            {
+                ALOGV("Track (%p) hasn't been initialized yet!", track);
+            }
             tracksToRemove.push_back(track);
         }
 

cocos/audio/android/AudioMixerController.h

@@ -54,7 +54,6 @@ public:
     bool init();
 
     bool addTrack(Track* track);
-
     bool hasPlayingTacks();
 
     void pause();
@@ -67,6 +66,7 @@ public:
 
 private:
     void destroy();
+    void initTrack(Track* track, std::vector<Track*>& tracksToRemove);
 
 private:
     int _bufferSizeInFrames;

cocos/audio/android/Track.cpp

@@ -40,6 +40,7 @@ Track::Track(const PcmData &pcmData)
         , _volume(1.0f)
         , _isVolumeDirty(true)
         , _isLoop(false)
+        , _isInitialized(false)
 {
     init(_pcmData.pcmBuffer->data(), _pcmData.numFrames, _pcmData.bitsPerSample / 8 * _pcmData.numChannels);
 }

cocos/audio/android/Track.h

@@ -79,6 +79,12 @@ private:
     inline void setVolumeDirty(bool isDirty)
     { _isVolumeDirty = isDirty; };
 
+    inline bool isInitialized() const
+    { return _isInitialized; };
+
+    inline void setInitialized(bool isInitialized)
+    { _isInitialized = isInitialized; };
+
 private:
     PcmData _pcmData;
     State _prevState;
@@ -89,6 +95,7 @@ private:
     bool _isVolumeDirty;
     std::mutex _volumeDirtyMutex;
     bool _isLoop;
+    bool _isInitialized;
 
     friend class AudioMixerController;
 };

tests/cpp-tests/Classes/NewAudioEngineTest/NewAudioEngineTest.cpp

@@ -42,6 +42,7 @@ AudioEngineTests::AudioEngineTests()
     ADD_TEST_CASE(AudioPerformanceTest);
     ADD_TEST_CASE(AudioSwitchStateTest);
     ADD_TEST_CASE(AudioSmallFileTest);
+    ADD_TEST_CASE(AudioPauseResumeAfterPlay);
 }
 
 namespace {
@@ -803,3 +804,27 @@ std::string AudioSmallFileTest::subtitle() const
 {
     return "Should not crash";
 }
+
+/////////////////////////////////////////////////////////////////////////
+bool AudioPauseResumeAfterPlay::init()
+{
+    if (AudioEngineTestDemo::init())
+    {
+        int audioId = AudioEngine::play2d("audio/SoundEffectsFX009/FX082.mp3");
+        AudioEngine::pause(audioId);
+        AudioEngine::resume(audioId);
+        return true;
+    }
+    
+    return false;
+}
+
+std::string AudioPauseResumeAfterPlay::title() const
+{
+    return "pause & resume right after play2d";
+}
+
+std::string AudioPauseResumeAfterPlay::subtitle() const
+{
+    return "Should not crash";
+}

tests/cpp-tests/Classes/NewAudioEngineTest/NewAudioEngineTest.h

@@ -199,4 +199,15 @@ public:
     virtual std::string subtitle() const override;
 };
 
+class AudioPauseResumeAfterPlay : public AudioEngineTestDemo
+{
+public:
+    CREATE_FUNC(AudioPauseResumeAfterPlay);
+    
+    virtual bool init() override;
+    
+    virtual std::string title() const override;
+    virtual std::string subtitle() const override;
+};
+
 #endif /* defined(__NEWAUDIOENGINE_TEST_H_) */