Refactor audio engine module, replace backend with OpenAL for android

cocos/audio/AudioEngine.cpp

@@ -1,7 +1,8 @@
 /****************************************************************************
  Copyright (c) 2014-2016 Chukong Technologies Inc.
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
-
+ Copyright (c) 2018 HALX99.
+
  http://www.cocos2d-x.org
 
  Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -32,7 +33,7 @@
 #include "base/ccUtils.h"
 
 #if CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID
-#include "audio/android/AudioEngine-inl.h"
+#include "audio/android/AudioEngineImpl.h"
 #elif CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_MAC
 #include "audio/apple/AudioEngine-inl.h"
 #elif CC_TARGET_PLATFORM == CC_PLATFORM_WIN32

cocos/audio/CMakeLists.txt

@@ -33,80 +33,31 @@ if(WINDOWS)
 elseif(ANDROID)
 
     set(COCOS_AUDIO_PLATFORM_HEADER
-        audio/android/PcmAudioService.h
-        audio/android/AudioBufferProvider.h
-        audio/android/IAudioPlayer.h
-        audio/android/AudioResampler.h
-        audio/android/AudioDecoder.h
-        audio/android/AudioResamplerPublic.h
-        audio/android/AudioMixer.h
-        audio/android/tinysndfile.h
-        audio/android/mp3reader.h
-        audio/android/AudioMixerOps.h
-        audio/android/cutils/bitops.h
-        audio/android/cutils/log.h
-        audio/android/audio.h
-        audio/android/AudioPlayerProvider.h
-        audio/android/utils/Utils.h
-        audio/android/utils/Errors.h
-        audio/android/utils/Compat.h
         audio/android/ccdandroidUtils.h
-        audio/android/AudioDecoderOgg.h
-        audio/android/Track.h
-        audio/android/OpenSLHelper.h
-        audio/android/PcmAudioPlayer.h
-        audio/android/AssetFd.h
-        audio/android/PcmBufferProvider.h
-        audio/android/CCThreadPool.h
-        audio/android/audio_utils/include/audio_utils/minifloat.h
-        audio/android/audio_utils/include/audio_utils/primitives.h
-        audio/android/audio_utils/include/audio_utils/format.h
-        audio/android/audio_utils/private/private.h
-        audio/android/ICallerThreadUtils.h
-        audio/android/AudioDecoderWav.h
-        audio/android/AudioDecoderProvider.h
-        audio/android/UrlAudioPlayer.h
-        audio/android/AudioDecoderSLES.h
-        audio/android/AudioDecoderMp3.h
-        audio/android/PcmData.h
         audio/android/jni/cddandroidAndroidJavaEngine.h
-        audio/android/AudioMixerController.h
-        audio/android/AudioResamplerCubic.h
-        audio/android/AudioEngine-inl.h
-        audio/android/IVolumeProvider.h
-
+        audio/android/utils/Utils.h
+        audio/android/AudioEngineImpl.h
+        audio/android/AudioCache.h
+        audio/android/AudioDecoder.h
+        audio/android/AudioDecoderManager.h
+        audio/android/AudioDecoderMp3.h
+        audio/android/AudioDecoderOgg.h
+        audio/android/AudioPlayer.h
+        audio/android/log.h
         )
 
     set(COCOS_AUDIO_PLATFORM_SRC
         audio/android/cddSimpleAudioEngine.cpp
         audio/android/ccdandroidUtils.cpp
         audio/android/jni/cddandroidAndroidJavaEngine.cpp
-        audio/android/AudioEngine-inl.cpp
-        audio/android/CCThreadPool.cpp
-        audio/android/AssetFd.cpp
+        audio/android/utils/Utils.cpp
+        audio/android/AudioEngineImpl.cpp
+        audio/android/AudioCache.cpp
         audio/android/AudioDecoder.cpp
-        audio/android/AudioDecoderProvider.cpp
-        audio/android/AudioDecoderSLES.cpp
-        audio/android/AudioDecoderOgg.cpp
+        audio/android/AudioDecoderManager.cpp
         audio/android/AudioDecoderMp3.cpp
-        audio/android/AudioDecoderWav.cpp
-        audio/android/AudioPlayerProvider.cpp
-        audio/android/AudioResampler.cpp
-        audio/android/AudioResamplerCubic.cpp
-        audio/android/PcmBufferProvider.cpp
-        audio/android/PcmAudioPlayer.cpp
-        audio/android/UrlAudioPlayer.cpp
-        audio/android/PcmData.cpp
-        audio/android/AudioMixerController.cpp
-        audio/android/AudioMixer.cpp
-        audio/android/PcmAudioService.cpp
-        audio/android/Track.cpp
-        audio/android/audio_utils/format.c
-        audio/android/audio_utils/minifloat.cpp
-        audio/android/audio_utils/primitives.c
-        audio/android/utils/Utils.cpp
-        audio/android/mp3reader.cpp
-        audio/android/tinysndfile.cpp
+        audio/android/AudioDecoderOgg.cpp
+        audio/android/AudioPlayer.cpp
         )
 
 elseif(LINUX)

cocos/audio/android/Android.mk

@@ -7,33 +7,15 @@ LOCAL_MODULE := audioengine_static
 
 LOCAL_MODULE_FILENAME := libaudioengine
 
-LOCAL_SRC_FILES := AudioEngine-inl.cpp \
+LOCAL_SRC_FILES := AudioEngineImpl.cpp \
                    ../AudioEngine.cpp \
-                   CCThreadPool.cpp \
-                   AssetFd.cpp \
                    AudioDecoder.cpp \
-                   AudioDecoderProvider.cpp \
-                   AudioDecoderSLES.cpp \
                    AudioDecoderOgg.cpp \
                    AudioDecoderMp3.cpp \
-                   AudioDecoderWav.cpp \
-                   AudioPlayerProvider.cpp \
-                   AudioResampler.cpp \
-                   AudioResamplerCubic.cpp \
-                   PcmBufferProvider.cpp \
-                   PcmAudioPlayer.cpp \
-                   UrlAudioPlayer.cpp \
-                   PcmData.cpp \
-                   AudioMixerController.cpp \
-                   AudioMixer.cpp \
-                   PcmAudioService.cpp \
-                   Track.cpp \
-                   audio_utils/format.c \
-                   audio_utils/minifloat.cpp \
-                   audio_utils/primitives.c \
-                   utils/Utils.cpp \
-                   mp3reader.cpp \
-                   tinysndfile.cpp
+                   AudioCache.cpp \
+                   AudioDecoderManager.cpp \
+                   AudioPlayer.cpp \
+                   utils/Utils.cpp
 
 
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../include
@@ -43,12 +25,14 @@ LOCAL_EXPORT_LDLIBS := -lOpenSLES
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/../include \
                     $(LOCAL_PATH)/../.. \
                     $(LOCAL_PATH)/../../platform/android \
-                    $(LOCAL_PATH)/../../../external/android-specific \
-                    $(LOCAL_PATH)/../../../external/android-specific/tremolo
-
-LOCAL_STATIC_LIBRARIES += libvorbisidec libpvmp3dec
+                    $(LOCAL_PATH)/../../../external/android-specific/OggDecoder/include \
+                    $(LOCAL_PATH)/../../../external/android-specific/MP3Decoder/include \
+                    $(LOCAL_PATH)/../../../external/android-specific/OpenalSoft/include
+
+LOCAL_SHARED_LIBRARIES += mpg123_shared openal_shared
+LOCAL_WHOLE_STATIC_LIBRARIES += cocos_ogg_static cocos_vorbis_static cocos_vorbisfile_static
 include $(BUILD_STATIC_LIBRARY)
-
+
 #SimpleAudioEngine
 include $(CLEAR_VARS)
 
@@ -69,5 +53,6 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../include \
 
 include $(BUILD_STATIC_LIBRARY)
 
-$(call import-module,android-specific/tremolo)
-$(call import-module,android-specific/pvmp3dec)
+$(call import-module,android-specific/OggDecoder/prebuilt)
+$(call import-module,android-specific/MP3Decoder/prebuilt)
+$(call import-module,android-specific/OpenalSoft/prebuilt)