idf overriding method to bring back SPDIF and fix SPI + new CSPOT (which crashes)

2025-12-13 15:07:01 +03:00 · 2022-01-04 00:15:33 -08:00
parent cf1315e6a4
commit 06b637c55b
43 changed files with 2955 additions and 402 deletions
--- a/components/spotify/cspot/bell/CMakeLists.txt
+++ b/components/spotify/cspot/bell/CMakeLists.txt
@@ -1,80 +1,100 @@
+cmake_minimum_required(VERSION 2.8.12)
+
 project(bell)

-cmake_minimum_required(VERSION 2.8.9)
-set (CMAKE_CXX_STANDARD 17)
+# Configurable options
+option(BELL_DISABLE_CODECS "Disable libhelix AAC and MP3 codecs" OFF)
+#set(BELL_EXTERNAL_CJSON "" CACHE STRING "External cJSON library target name, optional")
+#set(BELL_EXTERNAL_TREMOR "" CACHE STRING "External tremor library target name, optional")

-file(GLOB SOURCES "src/*.cpp" "src/*.c")
+add_definitions(-DPB_ENABLE_MALLOC)
+
+# Include nanoPB library
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/nanopb/extra)
+find_package(Nanopb REQUIRED)
+include_directories(${NANOPB_INCLUDE_DIRS})
+
+# CMake options
+set(CMAKE_CXX_STANDARD 17)
+add_definitions(-DUSE_DEFAULT_STDLIB=1)
+
+# Main library sources
+file(GLOB SOURCES "src/*.cpp" "src/*.c" "nanopb/*.c")

 # Add platform specific sources
-
-if(${ESP_PLATFORM})
+if(ESP_PLATFORM)
    file(GLOB ESP_PLATFORM_SOURCES "src/platform/esp/*.cpp" "src/platform/esp/*.c" "src/asm/biquad_f32_ae32.S")
-    set(SOURCES ${SOURCES} ${ESP_PLATFORM_SOURCES} )
+    list(APPEND SOURCES ${ESP_PLATFORM_SOURCES})
 endif()

 if(UNIX)
    file(GLOB UNIX_PLATFORM_SOURCES "src/platform/unix/*.cpp" "src/platform/linux/TLSSocket.cpp" "src/platform/unix/*.c")
-    set(SOURCES ${SOURCES} ${UNIX_PLATFORM_SOURCES} )
+    list(APPEND SOURCES ${UNIX_PLATFORM_SOURCES})
 endif()

 if(APPLE)
    file(GLOB APPLE_PLATFORM_SOURCES "src/platform/apple/*.cpp" "src/platform/linux/TLSSocket.cpp"  "src/platform/apple/*.c")
-    set(SOURCES ${SOURCES} ${APPLE_PLATFORM_SOURCES} )
+    list(APPEND SOURCES ${APPLE_PLATFORM_SOURCES})
 endif()

 if(UNIX AND NOT APPLE)
    file(GLOB LINUX_PLATFORM_SOURCES "src/platform/linux/*.cpp" "src/platform/linux/*.c")
-    set(SOURCES ${SOURCES} ${LINUX_PLATFORM_SOURCES} )
+    list(APPEND SOURCES ${LINUX_PLATFORM_SOURCES})
 endif()

-if(${ESP_PLATFORM})
-    list(REMOVE_ITEM SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/CryptoOpenSSL.cpp) # use MBedTLS 
+if(ESP_PLATFORM)
+    # Use MBedTLS on ESP32
+    list(REMOVE_ITEM SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/CryptoOpenSSL.cpp)
    idf_build_set_property(COMPILE_DEFINITIONS "-DBELL_USE_MBEDTLS" APPEND)
-    set(EXTRA_REQ_LIBS idf::mbedtls idf::pthread idf::mdns)
+    list(APPEND EXTRA_LIBS idf::mbedtls idf::pthread idf::mdns)
    add_definitions(-Wunused-const-variable -Wchar-subscripts -Wunused-label -Wmaybe-uninitialized -Wmisleading-indentation)
 else()
-    list(REMOVE_ITEM SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/CryptoMbedTLS.cpp) # use OpenSSL
+    # Use OpenSSL elsewhere
+    list(REMOVE_ITEM SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/CryptoMbedTLS.cpp)
    find_package(OpenSSL REQUIRED)
+    find_package(Threads REQUIRED)
+    set(THREADS_PREFER_PTHREAD_FLAG ON)
    if(OPENSSL_FOUND)
        set(OPENSSL_USE_STATIC_LIBS TRUE)
    endif()
-    set(EXTRA_REQ_LIBS OpenSSL::Crypto OpenSSL::SSL Threads::Threads)
-    set(THREADS_PREFER_PTHREAD_FLAG ON)
-    find_package(Threads REQUIRED)
+    list(APPEND EXTRA_LIBS OpenSSL::Crypto OpenSSL::SSL Threads::Threads)
 endif()

-if (BELL_DISABLE_CODECS) 
-    list(REMOVE_ITEM SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/DecoderGlobals.cpp) # use OpenSSL
-	add_definitions(-DBELL_DISABLE_CODECS)
+if(BELL_DISABLE_CODECS)
+    list(REMOVE_ITEM SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/DecoderGlobals.cpp)
 else()
-	set(EXTRA_INC ${EXTRA_INC} "libhelix-aac" "libhelix-mp3")
-	set(SOURCES ${SOURCES} "libhelix-aac/aacdec.c" "libhelix-aac/aactabs.c" "libhelix-aac/bitstream.c" "libhelix-aac/buffers.c" "libhelix-aac/dct4.c" "libhelix-aac/decelmnt.c" "libhelix-aac/dequant.c" "libhelix-aac/fft.c" "libhelix-aac/filefmt.c" "libhelix-aac/huffman.c" "libhelix-aac/hufftabs.c" "libhelix-aac/imdct.c" "libhelix-aac/noiseless.c" "libhelix-aac/pns.c" "libhelix-aac/sbr.c" "libhelix-aac/sbrfft.c" "libhelix-aac/sbrfreq.c" "libhelix-aac/sbrhfadj.c" "libhelix-aac/sbrhfgen.c" "libhelix-aac/sbrhuff.c" "libhelix-aac/sbrimdct.c" "libhelix-aac/sbrmath.c" "libhelix-aac/sbrqmf.c" "libhelix-aac/sbrside.c" "libhelix-aac/sbrtabs.c" "libhelix-aac/stproc.c" "libhelix-aac/tns.c" "libhelix-aac/trigtabs.c")
-	set(SOURCES ${SOURCES} "libhelix-mp3/bitstream.c" "libhelix-mp3/buffers.c" "libhelix-mp3/dct32.c" "libhelix-mp3/dequant.c" "libhelix-mp3/dqchan.c" "libhelix-mp3/huffman.c" "libhelix-mp3/hufftabs.c" "libhelix-mp3/imdct.c" "libhelix-mp3/mp3dec.c" "libhelix-mp3/mp3tabs.c" "libhelix-mp3/polyphase.c" "libhelix-mp3/scalfact.c" "libhelix-mp3/stproc.c" "libhelix-mp3/subband.c" "libhelix-mp3/trigtabs.c")
+    file(GLOB LIBHELIX_AAC_SOURCES "libhelix-aac/*.c")
+    file(GLOB LIBHELIX_MP3_SOURCES "libhelix-mp3/*.c")
+    list(APPEND EXTRA_INCLUDES "libhelix-aac" "libhelix-mp3")
+    list(APPEND SOURCES ${LIBHELIX_MP3_SOURCES} ${LIBHELIX_AAC_SOURCES})
+
+    if(CYGWIN)
+        # Both Cygwin and ESP are Unix-like so this seems to work (or, at least, compile)
+        set_source_files_properties(src/DecoderGlobals.cpp PROPERTIES COMPILE_FLAGS -DESP_PLATFORM)
+        set_source_files_properties(${LIBHELIX_AAC_SOURCES} PROPERTIES COMPILE_FLAGS -DESP_PLATFORM)
+        set_source_files_properties(${LIBHELIX_MP3_SOURCES} PROPERTIES COMPILE_FLAGS -DESP_PLATFORM)
+    endif()
 endif()

-if(UNIX AND NOT APPLE)
-    set(EXTRA_REQ_LIBS ${EXTRA_REQ_LIBS} dns_sd) # add apple bonjur compatibility library for linux
-    # TODO: migrate from this to native linux mDNS
-endif()
-add_definitions( -DUSE_DEFAULT_STDLIB=1)
-
-if (BELL_CJSON_EXTERNAL) 
-	message("Using external cJSON")
-	set(EXTRA_REQ_LIBS ${EXTRA_REQ_LIBS} ${BELL_CJSON_EXTERNAL})
-else() 
-	set(EXTRA_INC ${EXTRA_INC} "cJSON")
-	set(SOURCES ${SOURCES} "cJSON/cJSON.c")
-endif()
-
-if (BELL_TREMOR_EXTERNAL) 
-	message("Using external TREMOR")
-	set(EXTRA_REQ_LIBS ${EXTRA_REQ_LIBS} ${BELL_TREMOR_EXTERNAL})
+if(BELL_EXTERNAL_CJSON)
+    list(APPEND EXTRA_LIBS ${BELL_EXTERNAL_CJSON})
 else()
-	set(EXTRA_INC ${EXTRA_INC} "tremor")
-	set(SOURCES ${SOURCES} "tremor/mdct.c" "tremor/dsp.c" "tremor/info.c" "tremor/misc.c" "tremor/floor1.c" "tremor/floor0.c" "tremor/vorbisfile.c" "tremor/res012.c" "tremor/mapping0.c" "tremor/codebook.c" "tremor/framing.c" "tremor/bitwise.c" "tremor/floor_lookup.c")
+    list(APPEND EXTRA_INCLUDES "cJSON")
+    list(APPEND SOURCES "cJSON/cJSON.c")
+endif()
+
+if(BELL_EXTERNAL_TREMOR)
+    list(APPEND EXTRA_LIBS ${BELL_EXTERNAL_TREMOR})
+else()
+    file(GLOB TREMOR_SOURCES "tremor/*.c")
+    list(REMOVE_ITEM TREMOR_SOURCES "tremor/ivorbisfile_example.c")
+    list(APPEND EXTRA_INCLUDES "tremor")
+    list(APPEND SOURCES ${TREMOR_SOURCES})
 endif()

 add_library(bell STATIC ${SOURCES})
-target_link_libraries(bell PRIVATE ${EXTRA_REQ_LIBS})
-target_include_directories(bell PUBLIC "include" "protos" ${EXTRA_INC} ${EXTRA_REQ_LIBS} ${CMAKE_CURRENT_BINARY_DIR})

+message(${NANOPB_INCLUDE_DIRS})
+# PUBLIC to propagate esp-idf includes to bell dependents
+target_link_libraries(bell PUBLIC ${EXTRA_LIBS})
+target_include_directories(bell PUBLIC "include" ${EXTRA_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR})