diff --git a/native/cocos/audio/AudioEngine.cpp b/native/cocos/audio/AudioEngine.cpp index a983cabb2b..e6a726a159 100644 --- a/native/cocos/audio/AudioEngine.cpp +++ b/native/cocos/audio/AudioEngine.cpp @@ -290,13 +290,7 @@ void AudioEngine::pause(int audioID) { } void AudioEngine::pauseAll() { - auto itEnd = sAudioIDInfoMap.end(); - for (auto it = sAudioIDInfoMap.begin(); it != itEnd; ++it) { - if (it->second.state == AudioState::PLAYING) { - sAudioEngineImpl->pause(it->first); - it->second.state = AudioState::PAUSED; - } - } + pauseAll(nullptr); } void AudioEngine::resume(int audioID) { @@ -308,11 +302,39 @@ void AudioEngine::resume(int audioID) { } void AudioEngine::resumeAll() { + resumeAll(nullptr); +} + +void AudioEngine::pauseAll(std::vector *pausedAudioIDs) { auto itEnd = sAudioIDInfoMap.end(); for (auto it = sAudioIDInfoMap.begin(); it != itEnd; ++it) { - if (it->second.state == AudioState::PAUSED) { - sAudioEngineImpl->resume(it->first); - it->second.state = AudioState::PLAYING; + if (it->second.state == AudioState::PLAYING) { + sAudioEngineImpl->pause(it->first); + it->second.state = AudioState::PAUSED; + if (pausedAudioIDs) pausedAudioIDs->push_back(it->first); + } + } +} + +void AudioEngine::resumeAll(std::vector *pausedAudioIDs) { + auto itEnd = sAudioIDInfoMap.end(); + if (pausedAudioIDs) { + for (auto id : *pausedAudioIDs) { + if (sAudioIDInfoMap.find(id) == sAudioIDInfoMap.end()) { + continue; + } + auto &audio = sAudioIDInfoMap[id]; + if (audio.state == AudioState::PAUSED) { + sAudioEngineImpl->resume(id); + audio.state = AudioState::PLAYING; + } + } + } else { + for (auto it = sAudioIDInfoMap.begin(); it != itEnd; ++it) { + if (it->second.state == AudioState::PAUSED) { + sAudioEngineImpl->resume(it->first); + it->second.state = AudioState::PLAYING; + } } } } @@ -326,7 +348,7 @@ void AudioEngine::onEnterBackground(const CustomEvent & /*event*/) { } } -#if CC_PLATFORM == CC_PLATFORM_ANDROID +#if CC_PLATFORM == CC_PLATFORM_ANDROID || CC_PLATFORM == CC_PLATFORM_OHOS if (sAudioEngineImpl) { sAudioEngineImpl->onPause(); } @@ -340,7 +362,7 @@ void AudioEngine::onEnterForeground(const CustomEvent & /*event*/) { } sBreakAudioID.clear(); -#if CC_PLATFORM == CC_PLATFORM_ANDROID +#if CC_PLATFORM == CC_PLATFORM_ANDROID || CC_PLATFORM == CC_PLATFORM_OHOS if (sAudioEngineImpl) { sAudioEngineImpl->onResume(); } diff --git a/native/cocos/audio/include/AudioEngine.h b/native/cocos/audio/include/AudioEngine.h index 27d7ac004e..572ea91155 100644 --- a/native/cocos/audio/include/AudioEngine.h +++ b/native/cocos/audio/include/AudioEngine.h @@ -314,6 +314,9 @@ protected: static void addTask(const std::function &task); static void remove(int audioID); + static void pauseAll(std::vector *pausedAudioIDs); + static void resumeAll(std::vector *pausedAudioIDs); + struct ProfileHelper { AudioProfile profile; diff --git a/native/cocos/audio/oalsoft/AudioEngine-soft.cpp b/native/cocos/audio/oalsoft/AudioEngine-soft.cpp index bd70e03364..36895ec79d 100644 --- a/native/cocos/audio/oalsoft/AudioEngine-soft.cpp +++ b/native/cocos/audio/oalsoft/AudioEngine-soft.cpp @@ -27,16 +27,6 @@ #include "audio/oalsoft/AudioEngine-soft.h" -#ifdef OPENAL_PLAIN_INCLUDES - #include "alc.h" - #include "alext.h" -#elif CC_PLATFORM == CC_PLATFORM_WINDOWS - #include "OpenalSoft/alc.h" - #include "OpenalSoft/alext.h" -#elif CC_PLATFORM == CC_PLATFORM_OHOS - #include "AL/alc.h" - #include "AL/alext.h" -#endif #include "audio/include/AudioEngine.h" #include "audio/oalsoft/AudioDecoderManager.h" #include "base/Scheduler.h" @@ -92,14 +82,14 @@ static void _winLog(const char *format, va_list args) { delete[] buf; } -#ifndef audioLog + #ifndef audioLog void audioLog(const char *format, ...) { va_list args; va_start(args, format); _winLog(format, args); va_end(args); } -#endif + #endif #else @@ -191,7 +181,7 @@ AudioCache *AudioEngineImpl::preload(const std::string &filePath, const std::fun audioCache = &it->second; } - if (audioCache && callback) { + if (audioCache != nullptr && callback) { audioCache->addLoadCallback(callback); } return audioCache; @@ -527,3 +517,12 @@ void AudioEngineImpl::uncacheAll() { bool AudioEngineImpl::checkAudioIdValid(int audioID) { return _audioPlayers.find(audioID) != _audioPlayers.end(); } + +void AudioEngineImpl::onPause() { + _pausedAudioList.clear(); + AudioEngine::pauseAll(&_pausedAudioList); +} + +void AudioEngineImpl::onResume() { + AudioEngine::resumeAll(&_pausedAudioList); +} diff --git a/native/cocos/audio/oalsoft/AudioEngine-soft.h b/native/cocos/audio/oalsoft/AudioEngine-soft.h index d3b52eca92..0ebc6ed838 100644 --- a/native/cocos/audio/oalsoft/AudioEngine-soft.h +++ b/native/cocos/audio/oalsoft/AudioEngine-soft.h @@ -27,11 +27,23 @@ #pragma once #include +#include #include "audio/oalsoft/AudioCache.h" #include "audio/oalsoft/AudioPlayer.h" #include "base/Ref.h" +#ifdef OPENAL_PLAIN_INCLUDES + #include "alc.h" + #include "alext.h" +#elif CC_PLATFORM == CC_PLATFORM_WINDOWS + #include "OpenalSoft/alc.h" + #include "OpenalSoft/alext.h" +#elif CC_PLATFORM == CC_PLATFORM_OHOS + #include "AL/alc.h" + #include "AL/alext.h" +#endif + namespace cc { class Scheduler; @@ -62,6 +74,9 @@ public: AudioCache *preload(const std::string &filePath, const std::function &callback); void update(float dt); + void onResume(); + void onPause(); + private: bool checkAudioIdValid(int audioID); void play2dImpl(AudioCache *cache, int audioID); @@ -70,17 +85,14 @@ private: //source,used std::unordered_map _alSourceUsed; - //filePath,bufferInfo std::unordered_map _audioCaches; - //audioID,AudioInfo std::unordered_map _audioPlayers; std::mutex _threadMutex; - - bool _lazyInitLoop; - - int _currentAudioID; - std::weak_ptr _scheduler; + bool _lazyInitLoop; + int _currentAudioID; + std::weak_ptr _scheduler; + std::vector _pausedAudioList; }; } // namespace cc diff --git a/native/cocos/audio/ohos/AudioDecoderWav.cpp b/native/cocos/audio/ohos/AudioDecoderWav.cpp index 49c9ffc9a4..0d39b981ed 100644 --- a/native/cocos/audio/ohos/AudioDecoderWav.cpp +++ b/native/cocos/audio/ohos/AudioDecoderWav.cpp @@ -72,7 +72,7 @@ void AudioDecoderWav::close() { uint32_t AudioDecoderWav::read(uint32_t framesToRead, char *pcmBuf) { auto *output = reinterpret_cast(pcmBuf); auto actualFrames = sf_readf_short(_sndHandle, output, framesToRead); - return actualFrames / _bytesPerFrame; + return actualFrames; } bool AudioDecoderWav::seek(uint32_t frameOffset) { diff --git a/native/cocos/platform/java/CanvasRenderingContext2D-java.cpp b/native/cocos/platform/java/CanvasRenderingContext2D-java.cpp index decd3cce7c..f47ac4ea71 100644 --- a/native/cocos/platform/java/CanvasRenderingContext2D-java.cpp +++ b/native/cocos/platform/java/CanvasRenderingContext2D-java.cpp @@ -224,10 +224,10 @@ public: if (_bufferWidth < 1.0F || _bufferHeight < 1.0F) { return; } - - auto arr = JniHelper::getEnv()->NewIntArray(imageData.getSize()/ 4); - JniHelper::getEnv()->SetIntArrayRegion(arr, 0, imageData.getSize()/4, - reinterpret_cast(imageData.getBytes())); + + auto arr = JniHelper::getEnv()->NewIntArray(imageData.getSize() / 4); + JniHelper::getEnv()->SetIntArrayRegion(arr, 0, imageData.getSize() / 4, + reinterpret_cast(imageData.getBytes())); JniHelper::callObjectVoidMethod(_obj, JCLS_CANVASIMPL, "_fillImageData", arr, imageWidth, imageHeight, offsetX, offsetY); ccDeleteLocalRef(JniHelper::getEnv(), arr); @@ -269,7 +269,9 @@ public: jsize len = JniHelper::getEnv()->GetArrayLength(arr); auto *jbarray = static_cast(malloc(len * sizeof(jbyte))); JniHelper::getEnv()->GetByteArrayRegion(arr, 0, len, jbarray); +#if CC_PLATFORM != CC_PLATFORM_OHOS unMultiplyAlpha(reinterpret_cast(jbarray), len); +#endif _data.fastSet(reinterpret_cast(jbarray), len); //IDEA: DON'T create new jbarray every time. ccDeleteLocalRef(JniHelper::getEnv(), arr); }