codecs: remove helix-acc and mad-mp3 support due to license issue

Author: sepnic

Liteplayer.png

@@ -1,31 +1,10 @@
-Liteplayer 是一个为嵌入式平台设计的低开销低延时的音频播放器，已运行在千万级别的设备上，包括 Android、iOS、Linux、RTOS 多种终端平台
+Liteplayer 是一个为嵌入式平台设计的低开销低延时的音频播放器，支持 Android、iOS、Linux、RTOS 等平台
 
 Liteplayer 具有如下特点：
-1. 支持 MP3、AAC、M4A、WAV、FLAC、OPUS 格式，支持本地文件、本地播放列表、HTTP/HTTPS/HLS 和 TTS 数据流，接口和状态机与 Android MediaPlayer 一致
+1. 支持 MP3、AAC、M4A、WAV、格式，支持本地文件、本地播放列表、HTTP/HTTPS/HLS 和 TTS 数据流，接口和状态机与 Android MediaPlayer 一致
 2. 极低的系统开销，1-2 个线程（建议网络流使用双线程模式，文件流使用单线程模式），最低至 48KB 堆内存占用，已集成在 主频192MHz + 内存448KB 的系统上并产品量产；高配置平台上可配置更大的缓冲区以取得更好的播放体验
 3. 高度的移植性，纯 C 语言 C99 标准，已运行在 Linux、Android、iOS、MacOS、FreeRTOS、AliOS-Things 上；如果其平台不支持 POSIX 接口规范，则实现 Thread、Memory、Time 相关的少量 OSAL 接口也可接入
 4. 抽象流数据输入、音频设备输出的接口，使用者可自由添加各种流协议如 rtsp、rtmp、sdcardfs、flash 等等
-5. 适配多个解码器，包括 libmad、pv-mp3、helix-aac、pv-aac 等等，也可适配芯片原厂提供的解码器
-6. 提供丰富的调试手段，可以收集及分析播放链路各节点的音频流数据；提供内存检测手段，能直观查看内存分配细节、分析内存泄漏和内存越界
-
-**核心播放接口**：
-- 提供播放器基本服务，包括 set_data_source、prepare、start、pause、resume、seek、stop、reset 等操作
-- https://github.com/sepnic/liteplayer_priv/blob/master/include/liteplayer_main.h
-
-**列表播放接口**：
-- 除了播放器基本功能外，还支持 m3u8 协议列表、本地播放列表、切换上下首、单曲循环等操作
-- https://github.com/sepnic/liteplayer_priv/blob/master/include/liteplayer_listplayer.h
-
-**TTS播放接口**：
-- 提供 TTS 流播放功能，支持 prepare、start、stop、reset 等操作
-- https://github.com/sepnic/liteplayer_priv/blob/master/include/liteplayer_ttsplayer.h
-
-**播放器适配层**：
-- 数据源输入、音频设备输出的抽象接口，默认适配了 "文件流-标准文件系统"、 "网络流-httpclient"、"音频设备输出-alsa/OpenSLES/AudioTrack"
-- https://github.com/sepnic/liteplayer_priv/blob/master/include/liteplayer_adapter.h
-
-**OSAL 适配层**：
-- Thread、Memory、Time 等操作系统相关的抽象接口，如果系统已支持 POSIX 接口规范，则不用修改直接使用即可
-- https://github.com/sepnic/sysutils/tree/cutils_c99/osal
+5. 适配多个解码器，包括 pv-mp3、pv-aac、wave 等等，也可适配芯片原厂提供的解码器
 
 ![LiteplayerArchitecture](https://github.com/sepnic/liteplayer_priv/blob/master/Liteplayer.png)

README.md

@@ -37,8 +37,8 @@ target_include_directories(sysutils PRIVATE
 
 # liteplayer_core
 file(GLOB CODEC_SRC src
-    ${TOP_DIR}/thirdparty/codecs/mp3-pvmp3/src/*.cpp
-    ${TOP_DIR}/thirdparty/codecs/aac-pvaac/*.cpp)
+    ${TOP_DIR}/thirdparty/codecs/pvmp3/src/*.cpp
+    ${TOP_DIR}/thirdparty/codecs/pvaac/*.cpp)
 set(LITEPLAYER_CORE_SRC
     ${CODEC_SRC}
     ${TOP_DIR}/src/esp_adf/audio_element.c
@@ -68,9 +68,9 @@ target_compile_options(liteplayer_core PRIVATE
 target_include_directories(liteplayer_core PRIVATE
     ${TOP_DIR}/thirdparty/sysutils/include
     ${TOP_DIR}/thirdparty/codecs
-    ${TOP_DIR}/thirdparty/codecs/mp3-pvmp3/include
-    ${TOP_DIR}/thirdparty/codecs/mp3-pvmp3/src
-    ${TOP_DIR}/thirdparty/codecs/aac-pvaac
+    ${TOP_DIR}/thirdparty/codecs/pvmp3/include
+    ${TOP_DIR}/thirdparty/codecs/pvmp3/src
+    ${TOP_DIR}/thirdparty/codecs/pvaac
     ${TOP_DIR}/src
     ${TOP_DIR}/adapter)
 

example/android/library/src/main/cpp/CMakeLists.txt

@@ -10,15 +10,15 @@ set(COMPONENT_ADD_INCLUDEDIRS ${TOP_DIR}/include)
 set(COMPONENT_PRIV_INCLUDEDIRS
     ${THIRDPARTY_DIR}/sysutils/include
     ${THIRDPARTY_DIR}/codecs
-    ${THIRDPARTY_DIR}/codecs/mp3-pvmp3/include
-    ${THIRDPARTY_DIR}/codecs/mp3-pvmp3/src
-    ${THIRDPARTY_DIR}/codecs/aac-pvaac
+    ${THIRDPARTY_DIR}/codecs/pvmp3/include
+    ${THIRDPARTY_DIR}/codecs/pvmp3/src
+    ${THIRDPARTY_DIR}/codecs/pvaac
     ${LITEPLAYER_DIR}
 )
 
 file(GLOB CODECS_SRCS src
-    ${THIRDPARTY_DIR}/codecs/mp3-pvmp3/src/*.cpp
-    ${THIRDPARTY_DIR}/codecs/aac-pvaac/*.cpp
+    ${THIRDPARTY_DIR}/codecs/pvmp3/src/*.cpp
+    ${THIRDPARTY_DIR}/codecs/pvaac/*.cpp
 )
 
 set(COMPONENT_SRCS

example/esp32/components/liteplayer_core/CMakeLists.txt

@@ -45,8 +45,8 @@ target_include_directories(sysutils PRIVATE ${TOP_DIR}/thirdparty/mbedtls/includ
 
 # liteplayer files
 file(GLOB LITEPLAYER_CODEC_SRC src
-    ${TOP_DIR}/thirdparty/codecs/mp3-pvmp3/src/*.cpp
-    ${TOP_DIR}/thirdparty/codecs/aac-pvaac/*.cpp
+    ${TOP_DIR}/thirdparty/codecs/pvmp3/src/*.cpp
+    ${TOP_DIR}/thirdparty/codecs/pvaac/*.cpp
 )
 set(LITEPLAYER_CORE_SRC
     ${LITEPLAYER_CODEC_SRC}
@@ -81,9 +81,9 @@ target_compile_options(liteplayer_core PRIVATE
 )
 target_include_directories(liteplayer_core PRIVATE
     ${TOP_DIR}/thirdparty/codecs
-    ${TOP_DIR}/thirdparty/codecs/mp3-pvmp3/include
-    ${TOP_DIR}/thirdparty/codecs/mp3-pvmp3/src
-    ${TOP_DIR}/thirdparty/codecs/aac-pvaac
+    ${TOP_DIR}/thirdparty/codecs/pvmp3/include
+    ${TOP_DIR}/thirdparty/codecs/pvmp3/src
+    ${TOP_DIR}/thirdparty/codecs/pvaac
     ${TOP_DIR}/src
 )
 

example/unix/CMakeLists.txt

@@ -4,60 +4,25 @@ project(liteplayer_core)
 set(TOP_DIR "${CMAKE_SOURCE_DIR}/..")
 
 # cflags: OS_LINUX, OS_ANDROID, OS_APPLE, OS_RTOS
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2 -fPIC -std=gnu99 -Wall -Werror -DOS_APPLE")
+set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   -O2 -fPIC -std=gnu99 -Wall -Werror -DOS_APPLE")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -fPIC -std=c++11 -Wall -Werror -DOS_APPLE")
 
 # include files
 include_directories(${TOP_DIR}/thirdparty/sysutils/include)
 include_directories(${TOP_DIR}/include)
 
 # liteplayer files
-set(CODECS_SRC
-    ${TOP_DIR}/thirdparty/codecs/mp3-mad/bit.c
-    ${TOP_DIR}/thirdparty/codecs/mp3-mad/decoder.c
-    ${TOP_DIR}/thirdparty/codecs/mp3-mad/fixed.c
-    ${TOP_DIR}/thirdparty/codecs/mp3-mad/frame.c
-    ${TOP_DIR}/thirdparty/codecs/mp3-mad/huffman.c
-    ${TOP_DIR}/thirdparty/codecs/mp3-mad/layer12.c
-    ${TOP_DIR}/thirdparty/codecs/mp3-mad/layer3.c
-    ${TOP_DIR}/thirdparty/codecs/mp3-mad/stream.c
-    ${TOP_DIR}/thirdparty/codecs/mp3-mad/synth.c
-    ${TOP_DIR}/thirdparty/codecs/mp3-mad/timer.c
-    ${TOP_DIR}/thirdparty/codecs/mp3-mad/version.c
-    ${TOP_DIR}/thirdparty/codecs/aac-helix/aacdec.c
-    ${TOP_DIR}/thirdparty/codecs/aac-helix/aactabs.c
-    ${TOP_DIR}/thirdparty/codecs/aac-helix/bitstream.c
-    ${TOP_DIR}/thirdparty/codecs/aac-helix/buffers.c
-    ${TOP_DIR}/thirdparty/codecs/aac-helix/dct4.c
-    ${TOP_DIR}/thirdparty/codecs/aac-helix/decelmnt.c
-    ${TOP_DIR}/thirdparty/codecs/aac-helix/dequant.c
-    ${TOP_DIR}/thirdparty/codecs/aac-helix/fft.c
-    ${TOP_DIR}/thirdparty/codecs/aac-helix/filefmt.c
-    ${TOP_DIR}/thirdparty/codecs/aac-helix/huffman.c
-    ${TOP_DIR}/thirdparty/codecs/aac-helix/hufftabs.c
-    ${TOP_DIR}/thirdparty/codecs/aac-helix/imdct.c
-    ${TOP_DIR}/thirdparty/codecs/aac-helix/noiseless.c
-    ${TOP_DIR}/thirdparty/codecs/aac-helix/pns.c
-    ${TOP_DIR}/thirdparty/codecs/aac-helix/sbr.c
-    ${TOP_DIR}/thirdparty/codecs/aac-helix/sbrfft.c
-    ${TOP_DIR}/thirdparty/codecs/aac-helix/sbrfreq.c
-    ${TOP_DIR}/thirdparty/codecs/aac-helix/sbrhfadj.c
-    ${TOP_DIR}/thirdparty/codecs/aac-helix/sbrhfgen.c
-    ${TOP_DIR}/thirdparty/codecs/aac-helix/sbrhuff.c
-    ${TOP_DIR}/thirdparty/codecs/aac-helix/sbrimdct.c
-    ${TOP_DIR}/thirdparty/codecs/aac-helix/sbrmath.c
-    ${TOP_DIR}/thirdparty/codecs/aac-helix/sbrqmf.c
-    ${TOP_DIR}/thirdparty/codecs/aac-helix/sbrside.c
-    ${TOP_DIR}/thirdparty/codecs/aac-helix/sbrtabs.c
-    ${TOP_DIR}/thirdparty/codecs/aac-helix/stproc.c
-    ${TOP_DIR}/thirdparty/codecs/aac-helix/tns.c
-    ${TOP_DIR}/thirdparty/codecs/aac-helix/trigtabs.c)
+file(GLOB CODECS_SRC src
+    ${TOP_DIR}/thirdparty/codecs/pvmp3/src/*.cpp
+    ${TOP_DIR}/thirdparty/codecs/pvaac/*.cpp
+)
 set(LITEPLAYER_SRC
     ${CODECS_SRC}
     ${TOP_DIR}/src/esp_adf/audio_element.c
     ${TOP_DIR}/src/esp_adf/audio_event_iface.c
-    ${TOP_DIR}/src/audio_decoder/mp3_mad_wrapper.c
+    ${TOP_DIR}/src/audio_decoder/mp3_pvmp3_wrapper.c
     ${TOP_DIR}/src/audio_decoder/mp3_decoder.c
-    ${TOP_DIR}/src/audio_decoder/aac_helix_wrapper.c
+    ${TOP_DIR}/src/audio_decoder/aac_pvaac_wrapper.c
     ${TOP_DIR}/src/audio_decoder/aac_decoder.c
     ${TOP_DIR}/src/audio_decoder/m4a_decoder.c
     ${TOP_DIR}/src/audio_decoder/wav_decoder.c
@@ -71,19 +36,23 @@ set(LITEPLAYER_SRC
     ${TOP_DIR}/src/liteplayer_debug.c
     ${TOP_DIR}/src/liteplayer_main.c
     ${TOP_DIR}/src/liteplayer_listplayer.c
-    ${TOP_DIR}/src/liteplayer_ttsplayer.c)
+    ${TOP_DIR}/src/liteplayer_ttsplayer.c
+)
 add_library(liteplayer_core STATIC ${LITEPLAYER_SRC})
 target_compile_options(liteplayer_core PRIVATE
-    -Wno-error=int-to-pointer-cast
-    #platform: __arm__/__amd64__, __GNUC__
     -D__amd64__
-    #libmad: LITEPLAYER_CONFIG_MAD_FPM_64BIT/LITEPLAYER_CONFIG_MAD_FPM_ARM/LITEPLAYER_CONFIG_MAD_FPM_DEFAULT
-    -DLITEPLAYER_CONFIG_MAD_FPM_DEFAULT
-    #helix-aac: don't config it if sbr isn't needed for rtos devices
+    -DLITEPLAYER_CONFIG_SINK_FIXED_S16LE
     -DLITEPLAYER_CONFIG_AAC_SBR
-    #sink: don't config it if sink support S24LE/S32LE
-    -DLITEPLAYER_CONFIG_SINK_FIXED_S16LE)
-target_include_directories(liteplayer_core PRIVATE ${TOP_DIR}/thirdparty/codecs ${TOP_DIR}/src)
+    -DOSCL_IMPORT_REF= -DOSCL_EXPORT_REF= -DOSCL_UNUSED_ARG=\(void\)
+    -Wno-error=unused-value -Wno-error=unused-function -Wno-error=narrowing
+)
+target_include_directories(liteplayer_core PRIVATE
+    ${TOP_DIR}/thirdparty/codecs
+    ${TOP_DIR}/thirdparty/codecs/pvmp3/include
+    ${TOP_DIR}/thirdparty/codecs/pvmp3/src
+    ${TOP_DIR}/thirdparty/codecs/pvaac
+    ${TOP_DIR}/src
+)
 
 # sysutils files
 set(SYSUTILS_SRC
@@ -94,5 +63,6 @@ set(SYSUTILS_SRC
     ${TOP_DIR}/thirdparty/sysutils/source/cutils/memdbg.c
     ${TOP_DIR}/thirdparty/sysutils/source/cutils/mlooper.c
     ${TOP_DIR}/thirdparty/sysutils/source/cutils/mqueue.c
-    ${TOP_DIR}/thirdparty/sysutils/source/cutils/ringbuf.c)
+    ${TOP_DIR}/thirdparty/sysutils/source/cutils/ringbuf.c
+)
 add_library(sysutils STATIC ${SYSUTILS_SRC})