3.3 ohos code optimization (#20869)

Author: IceBBBBB

.gitmodules

@@ -10,3 +10,11 @@
 [submodule "tests/cpp-tests/Resources/ccs-res"]
         path = tests/cpp-tests/Resources/ccs-res
         url = git://github.com/dumganhar/ccs-res.git
+[submodule "tests/cpp-tests/proj.ohos"]
+	path = tests/cpp-tests/proj.ohos
+	url = [email protected]:cocos2d/cocos2d-x-tests-harmonyos-next-project.git
+	branch = cpp-tests
+[submodule "tests/lua-tests/project/proj.ohos"]
+	path = tests/lua-tests/project/proj.ohos
+	url = [email protected]:cocos2d/cocos2d-x-tests-harmonyos-next-project.git
+	branch = lua-tests

CMakeLists.txt

@@ -154,6 +154,13 @@ include_directories(
   ${CMAKE_CURRENT_SOURCE_DIR}/external
 )
 
+if(OHOS)
+  include_directories(
+    ${CMAKE_CURRENT_SOURCE_DIR}/cocos/platform/ohos
+    ${CMAKE_CURRENT_SOURCE_DIR}/external/opengles/api
+    ${CMAKE_CURRENT_SOURCE_DIR}/cocos/platform/ohos
+  )
+endif()
 if(USE_PREBUILT_LIBS)
   include(CocosUsePrebuiltLibs)
 endif()
@@ -376,8 +383,6 @@ if(OHOS)
   add_subdirectory(external/lua/luajit)
   add_subdirectory(external/lua/tolua)
   add_subdirectory(external/websockets)
-  add_subdirectory(external/ohos-specific/pvmp3dec)
-  add_subdirectory(external/ohos-specific/tremolo)
 endif()
 
 # libcocos2d.a

cocos/CMakeLists.txt

@@ -165,7 +165,10 @@ else()
 endif()
 
 if(OHOS)
-target_link_libraries(cocos2d ${Drawing-lib} ${libace-lib} ${GLES-lib} ${libnapi-lib} ${libuv-lib} ${rawfile-lib} ${EGL-lib} ${hilog-lib} libohaudio.so libavplayer.so libnative_window.so libnative_buffer.so)
+  target_link_libraries(cocos2d ${Drawing-lib} ${libace-lib} ${GLES-lib} ${libnapi-lib} ${libuv-lib} ${rawfile-lib}
+    ${EGL-lib} ${hilog-lib} libohaudio.so libavplayer.so  libnative_window.so libnative_buffer.so
+    libnative_display_manager.so libohsensor.so libnative_media_codecbase.so libnative_media_core.so
+    libnative_media_acodec.so libnative_media_avdemuxer.so libnative_media_avsource.so)
 endif()
 
 
@@ -199,13 +202,8 @@ else()
   endforeach()
 endif()
 
-if(OHOS)
-  target_link_libraries(cocos2d
-          # ext_cpufeatures  TBD need fixed?
-          ext_pvmp3dec
-          ext_tremolo
-          )
-else()
+
+if(!OHOS)
   target_link_libraries(cocos2d xxhash ${PLATFORM_SPECIFIC_LIBS})
 endif()
 

cocos/audio/CMakeLists.txt

@@ -51,21 +51,19 @@ elseif(OHOS)
             audio/ohos/AssetFd.cpp
             audio/ohos/AudioDecoder.cpp
             audio/ohos/AudioDecoderProvider.cpp
-            audio/ohos/AudioDecoderSLES.cpp
-            audio/ohos/AudioDecoderOgg.cpp
-            audio/ohos/AudioDecoderMp3.cpp
             audio/ohos/AudioDecoderWav.cpp
+            audio/ohos/AudioDecoderOH.cpp
             audio/ohos/AudioPlayerProvider.cpp
             audio/ohos/AudioResampler.cpp
             audio/ohos/AudioResamplerCubic.cpp
             audio/ohos/PcmBufferProvider.cpp
             audio/ohos/PcmAudioPlayer.cpp
             audio/ohos/PcmData.cpp
             audio/ohos/PcmAudioService.cpp
-            audio/ohos/UrlAudioPlayer.cpp
+            audio/ohos/BigAudioPlayer.cpp
+            audio/ohos/BigAudioService.cpp
             audio/ohos/AudioMixerController.cpp
             audio/ohos/AudioMixer.cpp
-            audio/ohos/mp3reader.cpp
             audio/ohos/tinysndfile.cpp
             audio/ohos/Track.cpp
             audio/ohos/audio_utils/RefCounted.cpp

cocos/audio/ohos/AudioDecoder.cpp

@@ -75,9 +75,10 @@ namespace cocos2d { namespace experimental {
             ALOGV("~AudioDecoder() %p", this);
         }
 
-        bool AudioDecoder::init(const std::string &url, int sampleRate) {
+        bool AudioDecoder::init(const std::string &url, int sampleRate, AudioPlayerProvider::AudioFileInfo fileInfo) {
             _url = url;
             _sampleRate = sampleRate;
+            _fileInfo = fileInfo;
             return true;
         }
 
@@ -121,6 +122,25 @@ namespace cocos2d { namespace experimental {
             return ret;
         }
 
+        bool AudioDecoder::asyncStart() {
+            auto oldTime = clockNow();
+            auto nowTime = oldTime;
+            bool ret;
+            do {
+                ret = decodeToPcm();
+                if (!ret) {
+                    ALOGE("decodeToPcm (%s) failed!", _url.c_str());
+                    break;
+                }
+
+                nowTime = clockNow();
+                ALOGD("Decoding (%s) to pcm data wasted %fms", _url.c_str(), intervalInMS(oldTime, nowTime));
+            } while (false);
+            ALOGV_IF(!ret, "%s returns false, decode (%s)", __FUNCTION__, _url.c_str());
+            return ret;
+        }
+ 
+
         bool AudioDecoder::resample() {
             if (_result.sampleRate == _sampleRate) {
                 ALOGI("No need to resample since the sample rate (%d) of the decoded pcm data is the same as the device output sample rate",

cocos/audio/ohos/AudioDecoder.h

@@ -27,6 +27,7 @@ THE SOFTWARE.
 #include "OpenSLHelper.h"
 #include "PcmData.h"
 #include "base/CCData.h"
+#include "AudioPlayerProvider.h"
 
 namespace cocos2d {
     namespace experimental {
@@ -36,10 +37,12 @@ namespace cocos2d {
             AudioDecoder();
             virtual ~AudioDecoder();
 
-            virtual bool init(const std::string &url, int sampleRate);
+            virtual bool init(const std::string &url, int sampleRate, AudioPlayerProvider::AudioFileInfo fileInfo);
 
             bool start();
 
+            bool asyncStart();
+
             inline PcmData getResult() { return _result; };
 
         protected:
@@ -52,6 +55,7 @@ namespace cocos2d {
             static int fileClose(void *datasource);
             static long fileTell(void *datasource); // NOLINT
 
+            AudioPlayerProvider::AudioFileInfo _fileInfo;
             std::string _url;
             PcmData _result;
             int _sampleRate;