more codecs

Author: pschatzmann

.gitignore

@@ -1,2 +1,2 @@
 .vscode/
-build/
+build/

CMakeLists.txt

@@ -12,6 +12,9 @@ set(CMAKE_CXX_STANDARD 17)
 option(ADD_PORTAUDIO  "Do not use Portaudio" OFF) 
 option(BUILD_SHARED_LIBS "Build using shared libraries" OFF)
 
+set(CODEC "opus" CACHE STRING "codec selected by the user")
+set_property(CACHE CODEC PROPERTY STRINGS flac ogg opus pcm)
+
 
 # lots of warnings and all warnings as errors ?
 ## add_compile_options(-Wall -Wextra )
@@ -25,20 +28,39 @@ if(NOT arduino-audio-tools_POPULATED)
 endif()
 
 # opus
-FetchContent_Declare(arduino_libopus GIT_REPOSITORY https://github.com/pschatzmann/arduino-libopus.git GIT_TAG main  )
-FetchContent_GetProperties(arduino_libopus)
-if(NOT arduino_libopus_POPULATED)
-    FetchContent_Populate(arduino_libopus)
-    add_subdirectory(${arduino_libopus_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/arduino_libopus)
+if(CODEC==opus)
+    FetchContent_Declare(arduino_libopus GIT_REPOSITORY https://github.com/pschatzmann/arduino-libopus.git GIT_TAG main  )
+    FetchContent_GetProperties(arduino_libopus)
+    if(NOT arduino_libopus_POPULATED)
+        FetchContent_Populate(arduino_libopus)
+        add_subdirectory(${arduino_libopus_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/arduino_libopus)
+    endif()
+endif()
+
+# flac
+if(CODEC==flac)
+    FetchContent_Declare(arduino_libflac GIT_REPOSITORY https://github.com/pschatzmann/arduino-libflac.git GIT_TAG main  )
+    FetchContent_GetProperties(arduino_libflac)
+    if(NOT arduino_libflac_POPULATED)
+        FetchContent_Populate(arduino_libflac)
+        add_subdirectory(${arduino_libflac_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/arduino_libflac)
+    endif()
 endif()
 
+
 add_library(snapclient INTERFACE)
 
 # define location for header files
 target_include_directories(snapclient INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/src )
 
 # specify libraries
-target_link_libraries(snapclient INTERFACE arduino-audio-tools arduino_emulator arduino_libopus)
+if(CODEC==opus)
+    target_link_libraries(snapclient INTERFACE arduino-audio-tools arduino_emulator arduino_libopus)
+endif()
+if(CODEC==flac)
+    target_link_libraries(snapclient INTERFACE arduino-audio-tools arduino_emulator arduino_libflac)
+endif()
 
+target_compile_definitions(snapclient INTERFACE -DARDUINO -DEXIT_ON_STOP -DIS_DESKTOP -DCONFIG_USE_RTOS=0 -DCONFIG_USE_PSRAM=0 -DCONFIG_SNAPCLIENT_SNTP_ENABLE=0 -DCONFIG_SNAPCLIENT_USE_MDNS=0)
 
 

README.md

@@ -7,31 +7,28 @@
 ### Feature list
 
 - Header only C++ implementation
-- Opus and PCM decoding are currently supported
+- PCM, Opus and FLAC decoding are supported
 - Auto connect to snapcast server on network
 - The functionality has been tested on an ESP32
 - Memory efficient implementation, so that PSRAM is not needed
 - Use any output device or DSP chain suppored by the [Audio Tools](https://github.com/pschatzmann/arduino-audio-tools)
 
 ### Description
 
-I have converted the [snapclient](https://github.com/jorgenkraghjakobsen/snapclient) from Jørgen Kragh Jakobsen to an Arduino Library and integrated my AudioTools project to be used to define the output devices.
+I have rewritten the [snapclient](https://github.com/jorgenkraghjakobsen/snapclient) from Jørgen Kragh Jakobsen to an Arduino Library and integrated my AudioTools project to be used to define the output devices.
 
 ### Example Arduino Sketch
 
-Here is an example Arduino sketch that uses the Wifi as communication API, the Opus codec and outputs the audio with I2S: 
+Here is an example Arduino sketch that uses the Wifi as communication API, the WAVs codec and outputs the audio with I2S: 
 
 ```C++
 #include "AudioTools.h"
 #include "SnapClient.h"
-#include "AudioCodecs/CodecOpus.h"
 
-#define ARDUINO_LOOP_STACK_SIZE (10 * 1024)
-
-OpusAudioDecoder opus;
-I2SStream out;
+WAVDecoder pcm;
 WiFiClient wifi;
-SnapClient client(wifi, out, opus);
+I2SStream out;
+SnapClient client(wifi, out, pcm);
 
 void setup() {
   Serial.begin(115200);
@@ -63,13 +60,23 @@ void loop() {
 }
 
 ```
+Change the snapserver.conf to define ```codec = pcm``` and restart the snapserver with ```sudo service snapserver restart```.
+You can test now your sketch e.g. with ```ffmpeg -i http://stream.srg-ssr.ch/m/rsj/mp3_128 -f s16le -ar 48000 /tmp/snapfifo```
+
+For further information on codecs please check the information in the Uncyclo!
+
+
+### Documentation
 
-You can test your sketch e.g. with ```ffmpeg -i http://stream.srg-ssr.ch/m/rsj/mp3_128 -f s16le -ar 48000 /tmp/snapfifo```
+For further information 
+- consult the [class documentation](https://pschatzmann.github.io/arduino-snapclient/html/annotated.html) or
+- the [examples](examples/)
+- the Uncyclo
 
 
 ### Dependencies
 
-- [Audio Tools](https://github.com/pschatzmann/arduino-audio-tools)
+- [Audio Tools](https://github.com/pschatzmann/arduino-audio-tools) (mandatory)
 - [LibOpus](https://github.com/pschatzmann/arduino-libopus) (optional)
 - [LibFLAC.h](https://github.com/pschatzmann/arduino-libflac) (optinal)
 - [CodecVorbis](https://github.com/pschatzmann/arduino-libvorbis-idec) (optional)
@@ -80,10 +87,3 @@ You can test your sketch e.g. with ```ffmpeg -i http://stream.srg-ssr.ch/m/rsj/m
 Configuration settings can be found in [SnapConfig.h](https://github.com/pschatzmann/arduino-snapcast/blob/main/src/SnapConfig.h)
 
 
-
-
-### Documentation
-
-For further information consult the [class documentation](https://pschatzmann.github.io/arduino-snapclient/html/annotated.html) or the [examples](examples/).
-
-

desktop-client/CMakeLists.txt

@@ -2,8 +2,10 @@ cmake_minimum_required(VERSION 2.34)
 
 # set the project name
 project(desktop-client)
-set (CMAKE_CXX_STANDARD 11)
+set (CMAKE_CXX_STANDARD 17)
 set (DCMAKE_CXX_FLAGS "-Werror")
+# set (FETCHCONTENT_FULLY_DISCONNECTED ON)
+
 include(FetchContent)
 
 # Download miniaudio.h
@@ -15,14 +17,15 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
     add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_BINARY_DIR}/snapclient )
 endif()
 
+
 # build sketch as executable
 add_executable (desktop-client SnapClient.cpp)
 
 # set preprocessor defines
-target_compile_definitions(desktop-client PUBLIC -DARDUINO -DEXIT_ON_STOP -DIS_DESKTOP -DCONFIG_USE_RTOS=0 -DCONFIG_USE_PSRAM=0 -DCONFIG_SNAPCLIENT_SNTP_ENABLE=0 -DCONFIG_SNAPCLIENT_USE_MDNS=0)
+target_compile_definitions(desktop-client PUBLIC -DARDUINO -DEXIT_ON_STOP -DIS_DESKTOP -DCONFIG_USE_PSRAM=0 -DCONFIG_SNAPCLIENT_SNTP_ENABLE=0 -DCONFIG_SNAPCLIENT_USE_MDNS=0)
 
 # specify libraries
-target_link_libraries(desktop-client snapclient)
+target_link_libraries(desktop-client snapclient arduino-audio-tools arduino_emulator arduino_libvorbis)
 
 # to find include for miniaudio
 target_include_directories(desktop-client PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})

desktop-client/SnapClient.cpp

@@ -7,9 +7,12 @@
 #include "SnapClient.h"
 #include "AudioLibs/MiniAudioStream.h"
 #include "AudioCodecs/CodecOpus.h"
+//#include "AudioCodecs/CodecFLAC.h"   // https://github.com/pschatzmann/arduino-libflac.git
 
+//CsvOutput<int16_t> out;
 MiniAudioStream out;
 OpusAudioDecoder opus;
+//FLACDecoder flac;
 WiFiClient wifi;
 SnapClient client(wifi, out, opus);