ohos code optimization (#20861)

Author: IceBBBBB

CMakeLists.txt

@@ -245,8 +245,6 @@ if(OHOS)
   add_subdirectory(external/jpeg)
   add_subdirectory(external/tiff)
   add_subdirectory(external/zlib)
-  add_subdirectory(external/ohos-specific/pvmp3dec)
-  add_subdirectory(external/ohos-specific/tremolo)
   add_subdirectory(external/websockets)
   add_subdirectory(external/lua/luajit)
 

cocos/CMakeLists.txt

@@ -88,7 +88,7 @@ elseif(OHOS)
                   # Specifies the name of the NDK library that
                   # you want CMake to locate.
                   native_drawing )
-    set(COCOS_LINK ext_freetype ext_png ext_jpeg ext_tiff ext_webp ext_zlib ext_pvmp3dec ext_tremolo ${rawfile-lib} ${libnapi-lib} ${Drawing-lib} OpenSLES)
+    set(COCOS_LINK ext_freetype ext_png ext_jpeg ext_tiff ext_webp ext_zlib ${rawfile-lib} ${libnapi-lib} ${Drawing-lib} OpenSLES)
 else()
 set(COCOS_LINK
   jpeg
@@ -108,7 +108,10 @@ set(COCOS_LINK
 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 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()
 
 set(COMMON_LINK chipmunk_static tinyxml2 unzip xxhash)

cocos/audio/CMakeLists.txt

@@ -22,22 +22,20 @@ elseif(OHOS)
             ohos/AssetFd.cpp
             ohos/AudioDecoder.cpp
             ohos/AudioDecoderProvider.cpp
-            ohos/AudioDecoderSLES.cpp
-            ohos/AudioDecoderOgg.cpp
-            ohos/AudioDecoderMp3.cpp
             ohos/AudioDecoderWav.cpp
             ohos/AudioPlayerProvider.cpp
             ohos/AudioResampler.cpp
             ohos/AudioResamplerCubic.cpp
             ohos/CCData.cpp
             ohos/PcmBufferProvider.cpp
             ohos/PcmAudioPlayer.cpp
+            ohos/AudioDecoderOH.cpp
             ohos/PcmData.cpp
             ohos/PcmAudioService.cpp
-            ohos/UrlAudioPlayer.cpp
+            ohos/BigAudioPlayer.cpp
+            ohos/BigAudioService.cpp
             ohos/AudioMixerController.cpp
             ohos/AudioMixer.cpp
-            ohos/mp3reader.cpp
             ohos/tinysndfile.cpp
             ohos/Track.cpp
 
@@ -68,11 +66,6 @@ if(OHOS)
   include_directories(
     ../../cocos/2d
   )
-  target_link_libraries(audio 
-      # ext_cpufeatures  TBD need fixed?
-      ext_pvmp3dec 
-      ext_tremolo
-  )
 endif()
 
 if((NOT APPLE) AND (NOT WIN32) AND (NOT OHOS) )

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;