Mirror/squeezelite-esp32
1
0
Fork 0
mirror of https://github.com/sle118/squeezelite-esp32.git synced 2025-12-09 13:07:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

Include memory fixes from main branch

Browse Source
This commit is contained in:
sle118
2019-08-29 09:16:00 -04:00
parent 6e7793a756
commit 4a4614951e
23 changed files with 406 additions and 327 deletions
Download Patch File Download Diff File Expand all files Collapse all files

292
.cproject
View File

@@ -1,100 +1,198 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage"> <?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
<storageModule moduleId="org.eclipse.cdt.core.settings">
<cconfiguration id="cdt.managedbuild.toolchain.gnu.cross.base.1476804786"> <storageModule moduleId="org.eclipse.cdt.core.settings">
<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.toolchain.gnu.cross.base.1476804786" moduleId="org.eclipse.cdt.core.settings" name="Default">
<externalSettings/> <cconfiguration id="cdt.managedbuild.toolchain.gnu.cross.base.1476804786">
<extensions>
<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/> <storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.toolchain.gnu.cross.base.1476804786" moduleId="org.eclipse.cdt.core.settings" name="Default">
<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/> <externalSettings/>
<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/> <extensions>
<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
</extensions> <extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0"> <extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<configuration artifactName="${ProjName}" buildProperties="" description="" id="cdt.managedbuild.toolchain.gnu.cross.base.1476804786" name="Default" optionalBuildProperties="org.eclipse.cdt.docker.launcher.containerbuild.property.selectedvolumes=,org.eclipse.cdt.docker.launcher.containerbuild.property.volumes=" parent="org.eclipse.cdt.build.core.emptycfg">
<folderInfo id="cdt.managedbuild.toolchain.gnu.cross.base.1476804786.1800826258" name="/" resourcePath=""> <extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<toolChain id="cdt.managedbuild.toolchain.gnu.cross.base.811827721" name="Cross GCC" superClass="cdt.managedbuild.toolchain.gnu.cross.base">
<option id="cdt.managedbuild.option.gnu.cross.prefix.1666584715" name="Prefix" superClass="cdt.managedbuild.option.gnu.cross.prefix"/> <extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<option id="cdt.managedbuild.option.gnu.cross.path.144124148" name="Path" superClass="cdt.managedbuild.option.gnu.cross.path"/>
<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="cdt.managedbuild.targetPlatform.gnu.cross.1562292378" isAbstract="false" osList="all" superClass="cdt.managedbuild.targetPlatform.gnu.cross"/> <extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
<builder id="cdt.managedbuild.builder.gnu.cross.1011968237" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="cdt.managedbuild.builder.gnu.cross"/>
<tool id="cdt.managedbuild.tool.gnu.cross.c.compiler.1502936757" name="Cross GCC Compiler" superClass="cdt.managedbuild.tool.gnu.cross.c.compiler"> <extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1614739014" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
</tool> </extensions>
<tool id="cdt.managedbuild.tool.gnu.cross.cpp.compiler.254690821" name="Cross G++ Compiler" superClass="cdt.managedbuild.tool.gnu.cross.cpp.compiler">
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1365876654" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/> </storageModule>
</tool>
<tool id="cdt.managedbuild.tool.gnu.cross.c.linker.407309631" name="Cross GCC Linker" superClass="cdt.managedbuild.tool.gnu.cross.c.linker"/> <storageModule moduleId="cdtBuildSystem" version="4.0.0">
<tool id="cdt.managedbuild.tool.gnu.cross.cpp.linker.765822218" name="Cross G++ Linker" superClass="cdt.managedbuild.tool.gnu.cross.cpp.linker">
<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.655344480" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input"> <configuration artifactName="${ProjName}" buildProperties="" description="" id="cdt.managedbuild.toolchain.gnu.cross.base.1476804786" name="Default" optionalBuildProperties="org.eclipse.cdt.docker.launcher.containerbuild.property.selectedvolumes=,org.eclipse.cdt.docker.launcher.containerbuild.property.volumes=" parent="org.eclipse.cdt.build.core.emptycfg">
<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
<additionalInput kind="additionalinput" paths="$(LIBS)"/> <folderInfo id="cdt.managedbuild.toolchain.gnu.cross.base.1476804786.1800826258" name="/" resourcePath="">
</inputType>
</tool> <toolChain id="cdt.managedbuild.toolchain.gnu.cross.base.811827721" name="Cross GCC" superClass="cdt.managedbuild.toolchain.gnu.cross.base">
<tool id="cdt.managedbuild.tool.gnu.cross.archiver.1494383819" name="Cross GCC Archiver" superClass="cdt.managedbuild.tool.gnu.cross.archiver"/>
<tool id="cdt.managedbuild.tool.gnu.cross.assembler.280698320" name="Cross GCC Assembler" superClass="cdt.managedbuild.tool.gnu.cross.assembler"> <option id="cdt.managedbuild.option.gnu.cross.prefix.1666584715" name="Prefix" superClass="cdt.managedbuild.option.gnu.cross.prefix"/>
<inputType id="cdt.managedbuild.tool.gnu.assembler.input.1422333326" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
</tool> <option id="cdt.managedbuild.option.gnu.cross.path.144124148" name="Path" superClass="cdt.managedbuild.option.gnu.cross.path"/>
</toolChain>
</folderInfo> <targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="cdt.managedbuild.targetPlatform.gnu.cross.1562292378" isAbstract="false" osList="all" superClass="cdt.managedbuild.targetPlatform.gnu.cross"/>
</configuration>
</storageModule> <builder arguments="${IDF_PATH}/tools/windows/eclipse_make.py" command="python" id="cdt.managedbuild.builder.gnu.cross.1011968237" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="cdt.managedbuild.builder.gnu.cross"/>
<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
</cconfiguration> <tool id="cdt.managedbuild.tool.gnu.cross.c.compiler.1502936757" name="Cross GCC Compiler" superClass="cdt.managedbuild.tool.gnu.cross.c.compiler">
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0"> <inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1614739014" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
<project id="squeezelite-esp32.null.1272501664" name="squeezelite-esp32"/>
</storageModule> </tool>
<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
<storageModule moduleId="scannerConfiguration"> <tool id="cdt.managedbuild.tool.gnu.cross.cpp.compiler.254690821" name="Cross G++ Compiler" superClass="cdt.managedbuild.tool.gnu.cross.cpp.compiler">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.cross.base.1943329896;cdt.managedbuild.toolchain.gnu.cross.base.1943329896.30011915;cdt.managedbuild.tool.gnu.cross.cpp.compiler.1749746745;cdt.managedbuild.tool.gnu.cpp.compiler.input.1914005798"> <inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1365876654" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
</scannerConfigBuildInfo> </tool>
<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.cross.base.1476804786;cdt.managedbuild.toolchain.gnu.cross.base.1476804786.1800826258;cdt.managedbuild.tool.gnu.cross.cpp.compiler.254690821;cdt.managedbuild.tool.gnu.cpp.compiler.input.1365876654">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/> <tool id="cdt.managedbuild.tool.gnu.cross.c.linker.407309631" name="Cross GCC Linker" superClass="cdt.managedbuild.tool.gnu.cross.c.linker"/>
</scannerConfigBuildInfo>
<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.cross.base.1943329896;cdt.managedbuild.toolchain.gnu.cross.base.1943329896.30011915;cdt.managedbuild.tool.gnu.cross.c.compiler.2083405506;cdt.managedbuild.tool.gnu.c.compiler.input.404320567"> <tool id="cdt.managedbuild.tool.gnu.cross.cpp.linker.765822218" name="Cross G++ Linker" superClass="cdt.managedbuild.tool.gnu.cross.cpp.linker">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
</scannerConfigBuildInfo> <inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.655344480" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.cross.base.1476804786;cdt.managedbuild.toolchain.gnu.cross.base.1476804786.1800826258;cdt.managedbuild.tool.gnu.cross.c.compiler.1502936757;cdt.managedbuild.tool.gnu.c.compiler.input.1614739014">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/> <additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
</scannerConfigBuildInfo>
</storageModule> <additionalInput kind="additionalinput" paths="$(LIBS)"/>
<storageModule moduleId="refreshScope" versionNumber="2">
<configuration configurationName="Default"> </inputType>
<resource resourceType="PROJECT" workspacePath="/squeezelite-esp32"/>
</configuration> </tool>
</storageModule>
<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"> <tool id="cdt.managedbuild.tool.gnu.cross.archiver.1494383819" name="Cross GCC Archiver" superClass="cdt.managedbuild.tool.gnu.cross.archiver"/>
<buildTargets>
<target name="all" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> <tool id="cdt.managedbuild.tool.gnu.cross.assembler.280698320" name="Cross GCC Assembler" superClass="cdt.managedbuild.tool.gnu.cross.assembler">
<buildCommand>make</buildCommand>
<buildArguments/> <inputType id="cdt.managedbuild.tool.gnu.assembler.input.1422333326" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
<buildTarget>all</buildTarget>
<stopOnError>true</stopOnError> </tool>
<useDefaultCommand>true</useDefaultCommand>
<runAllBuilders>true</runAllBuilders> </toolChain>
</target>
<target name="size-components" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> </folderInfo>
<buildCommand>make</buildCommand>
<buildArguments/> </configuration>
<buildTarget>size-components</buildTarget>
<stopOnError>true</stopOnError> </storageModule>
<useDefaultCommand>true</useDefaultCommand>
<runAllBuilders>true</runAllBuilders> <storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
</target>
<target name="flash" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> </cconfiguration>
<buildCommand>make</buildCommand>
<buildArguments/> </storageModule>
<buildTarget>flash</buildTarget>
<stopOnError>true</stopOnError> <storageModule moduleId="cdtBuildSystem" version="4.0.0">
<useDefaultCommand>true</useDefaultCommand>
<runAllBuilders>true</runAllBuilders> <project id="squeezelite-esp32.null.1272501664" name="squeezelite-esp32"/>
</target>
</buildTargets> </storageModule>
</storageModule>
<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
<storageModule moduleId="scannerConfiguration">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.cross.base.1943329896;cdt.managedbuild.toolchain.gnu.cross.base.1943329896.30011915;cdt.managedbuild.tool.gnu.cross.cpp.compiler.1749746745;cdt.managedbuild.tool.gnu.cpp.compiler.input.1914005798">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
</scannerConfigBuildInfo>
<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.cross.base.1476804786;cdt.managedbuild.toolchain.gnu.cross.base.1476804786.1800826258;cdt.managedbuild.tool.gnu.cross.cpp.compiler.254690821;cdt.managedbuild.tool.gnu.cpp.compiler.input.1365876654">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
</scannerConfigBuildInfo>
<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.cross.base.1943329896;cdt.managedbuild.toolchain.gnu.cross.base.1943329896.30011915;cdt.managedbuild.tool.gnu.cross.c.compiler.2083405506;cdt.managedbuild.tool.gnu.c.compiler.input.404320567">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
</scannerConfigBuildInfo>
<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.cross.base.1476804786;cdt.managedbuild.toolchain.gnu.cross.base.1476804786.1800826258;cdt.managedbuild.tool.gnu.cross.c.compiler.1502936757;cdt.managedbuild.tool.gnu.c.compiler.input.1614739014">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
</scannerConfigBuildInfo>
</storageModule>
<storageModule moduleId="refreshScope" versionNumber="2">
<configuration configurationName="Default">
<resource resourceType="PROJECT" workspacePath="/squeezelite-esp32"/>
</configuration>
</storageModule>
<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets">
<buildTargets>
<target name="all" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
<buildCommand>make</buildCommand>
<buildArguments/>
<buildTarget>all</buildTarget>
<stopOnError>true</stopOnError>
<useDefaultCommand>true</useDefaultCommand>
<runAllBuilders>true</runAllBuilders>
</target>
<target name="size-components" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
<buildCommand>make</buildCommand>
<buildArguments/>
<buildTarget>size-components</buildTarget>
<stopOnError>true</stopOnError>
<useDefaultCommand>true</useDefaultCommand>
<runAllBuilders>true</runAllBuilders>
</target>
<target name="flash" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
<buildCommand>make</buildCommand>
<buildArguments/>
<buildTarget>flash</buildTarget>
<stopOnError>true</stopOnError>
<useDefaultCommand>true</useDefaultCommand>
<runAllBuilders>true</runAllBuilders>
</target>
</buildTargets>
</storageModule>
</cproject> </cproject>

37
.settings/language.settings.xml
View File

@@ -1,15 +1,28 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<project> <project>
<configuration id="cdt.managedbuild.toolchain.gnu.cross.base.1476804786" name="Default">
<extension point="org.eclipse.cdt.core.LanguageSettingsProvider"> <configuration id="cdt.managedbuild.toolchain.gnu.cross.base.1476804786" name="Default">
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/> <extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuildCommandParser" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser" keep-relative-paths="false" name="CDT GCC Build Output Parser" parameter="xtensa-esp32-elf-(gcc|g\+\+|c\+\+|cc|cpp|clang)" prefer-non-shared="true"/>
<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-869409282784451881" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="xtensa-esp32-elf-gcc ${FLAGS} -std=c++11 -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true"> <provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/> <provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
</provider>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/> <provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuildCommandParser" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser" keep-relative-paths="false" name="CDT GCC Build Output Parser" parameter="xtensa-esp32-elf-(gcc|g\+\+|c\+\+|cc|cpp|clang)" prefer-non-shared="true"/>
</extension>
</configuration> <provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="1104469646593236716" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="xtensa-esp32-elf-gcc ${FLAGS} -std=c++11 -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/>
</provider>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
</extension>
</configuration>
</project> </project>

2
components/driver_bt/CMakeLists.txt
View File

@@ -1,6 +1,6 @@
set(COMPONENT_ADD_INCLUDEDIRS . ) set(COMPONENT_ADD_INCLUDEDIRS . )
set(COMPONENT_SRCS "bt_app_core.c" ) set(COMPONENT_SRCS "bt_app_core.c" "bt_app_sink.c" "bt_app_source.c")
set(REQUIRES esp_common) set(REQUIRES esp_common)
set(REQUIRES_COMPONENTS freertos nvs_flash esp32 spi_flash newlib log console ) set(REQUIRES_COMPONENTS freertos nvs_flash esp32 spi_flash newlib log console )

34
components/driver_bt/bt_app_sink.c
View File

@@ -21,6 +21,7 @@
#include "esp_gap_bt_api.h" #include "esp_gap_bt_api.h"
#include "esp_a2dp_api.h" #include "esp_a2dp_api.h"
#include "esp_avrc_api.h" #include "esp_avrc_api.h"
#include "nvs.h"
#include "freertos/FreeRTOS.h" #include "freertos/FreeRTOS.h"
#include "freertos/task.h" #include "freertos/task.h"
@@ -39,9 +40,11 @@
#define BT_RC_CT_TAG "RCCT" #define BT_RC_CT_TAG "RCCT"
#ifndef CONFIG_BT_SINK_NAME #ifndef CONFIG_BT_SINK_NAME
#define CONFIG_BT_SINK_NAME "unavailable" #define CONFIG_BT_SINK_NAME "default"
#endif #endif
extern char current_namespace[];
/* event for handler "bt_av_hdl_stack_up */ /* event for handler "bt_av_hdl_stack_up */
enum { enum {
BT_APP_EVT_STACK_UP = 0, BT_APP_EVT_STACK_UP = 0,
@@ -352,7 +355,7 @@ static void bt_av_hdl_avrc_tg_evt(uint16_t event, void *p_param)
} }
} }
void bt_sink_init(void (*cmd_cb)(bt_sink_cmd_t cmd, ...), void (*data_cb)(const uint8_t *data, uint32_t len)) void bt_sink_init(bt_cmd_cb_t cmd_cb, bt_data_cb_t data_cb)
{ {
esp_err_t err; esp_err_t err;
@@ -409,6 +412,21 @@ void bt_sink_init(void (*cmd_cb)(bt_sink_cmd_t cmd, ...), void (*data_cb)(const
} }
void bt_sink_deinit(void)
{
/* this still does not work, can't figure out how to stop properly this BT stack */
bt_app_task_shut_down();
ESP_LOGI(BT_AV_TAG, "bt_app_task shutdown successfully");
if (esp_bluedroid_disable() != ESP_OK) return;
ESP_LOGI(BT_AV_TAG, "esp_bluedroid_disable called successfully");
if (esp_bluedroid_deinit() != ESP_OK) return;
ESP_LOGI(BT_AV_TAG, "esp_bluedroid_deinit called successfully");
if (esp_bt_controller_disable() != ESP_OK) return;
ESP_LOGI(BT_AV_TAG, "esp_bt_controller_disable called successfully");
if (esp_bt_controller_deinit() != ESP_OK) return;
ESP_LOGI(BT_AV_TAG, "bt stopped successfully");
}
static void bt_app_gap_cb(esp_bt_gap_cb_event_t event, esp_bt_gap_cb_param_t *param) static void bt_app_gap_cb(esp_bt_gap_cb_event_t event, esp_bt_gap_cb_param_t *param)
{ {
switch (event) { switch (event) {
@@ -449,8 +467,16 @@ static void bt_av_hdl_stack_evt(uint16_t event, void *p_param)
switch (event) { switch (event) {
case BT_APP_EVT_STACK_UP: { case BT_APP_EVT_STACK_UP: {
/* set up device name */ /* set up device name */
char *dev_name = CONFIG_BT_SINK_NAME; nvs_handle nvs;
esp_bt_dev_set_device_name(dev_name); char dev_name[32] = CONFIG_BT_SINK_NAME;
if (nvs_open(current_namespace, NVS_READONLY, &nvs) == ESP_OK) {
size_t len = 31;
nvs_get_str(nvs, "bt_sink_name", dev_name, &len);
nvs_close(nvs);
}
esp_bt_dev_set_device_name(dev_name);
esp_bt_gap_register_callback(bt_app_gap_cb); esp_bt_gap_register_callback(bt_app_gap_cb);

15
components/driver_bt/bt_app_sink.h
View File

@@ -14,9 +14,22 @@
typedef enum { BT_SINK_CONNECTED, BT_SINK_DISCONNECTED, BT_SINK_PLAY, BT_SINK_STOP, BT_SINK_PAUSE, typedef enum { BT_SINK_CONNECTED, BT_SINK_DISCONNECTED, BT_SINK_PLAY, BT_SINK_STOP, BT_SINK_PAUSE,
BT_SINK_RATE, BT_SINK_VOLUME, } bt_sink_cmd_t; BT_SINK_RATE, BT_SINK_VOLUME, } bt_sink_cmd_t;
typedef void (*bt_cmd_cb_t)(bt_sink_cmd_t cmd, ...);
typedef void (*bt_data_cb_t)(const uint8_t *data, uint32_t len);
/** /**
* @brief init sink mode (need to be provided) * @brief init sink mode (need to be provided)
*/ */
void bt_sink_init(void (*cmd_cb)(bt_sink_cmd_t cmd, ...), void (*data_cb)(const uint8_t *data, uint32_t len)); void bt_sink_init(bt_cmd_cb_t cmd_cb, bt_data_cb_t data_cb);
/**
* @brief deinit sink mode (need to be provided)
*/
void bt_sink_deinit(void);
/**
* @brief local command mode (stop, play, volume ...)
*/
void bt_sink_cmd(bt_sink_cmd_t event, ...);
#endif /* __BT_APP_SINK_H__*/ #endif /* __BT_APP_SINK_H__*/

3
components/driver_bt/component.mk
View File

@@ -7,5 +7,6 @@
# please read the SDK documents if you need to do this. # please read the SDK documents if you need to do this.
# #
CFLAGS += -I$(COMPONENT_PATH)/../tools CFLAGS += -I$(COMPONENT_PATH)/../tools
#CFLAGS += -DLOG_LOCAL_LEVEL=ESP_LOG_DEBUG #CFLAGS += -DLOG_LOCAL_LEVEL=ESP_LOG_DEBUG

1
components/io/led.c
View File

@@ -109,6 +109,7 @@ bool led_unconfig(int idx) {
if (idx >= MAX_LED) return false; if (idx >= MAX_LED) return false;
if (leds[idx].timer) xTimerDelete(leds[idx].timer, BLOCKTIME); if (leds[idx].timer) xTimerDelete(leds[idx].timer, BLOCKTIME);
leds[idx].timer = NULL;
return true; return true;
} }

6
components/squeezelite/buffer.c
View File

@@ -64,6 +64,11 @@ void buf_flush(struct buffer *buf) {
mutex_unlock(buf->mutex); mutex_unlock(buf->mutex);
} }
void _buf_flush(struct buffer *buf) {
buf->readp = buf->buf;
buf->writep = buf->buf;
}
// adjust buffer to multiple of mod bytes so reading in multiple always wraps on frame boundary // adjust buffer to multiple of mod bytes so reading in multiple always wraps on frame boundary
void buf_adjust(struct buffer *buf, size_t mod) { void buf_adjust(struct buffer *buf, size_t mod) {
size_t size; size_t size;
@@ -78,6 +83,7 @@ void buf_adjust(struct buffer *buf, size_t mod) {
// called with mutex locked to resize, does not retain contents, reverts to original size if fails // called with mutex locked to resize, does not retain contents, reverts to original size if fails
void _buf_resize(struct buffer *buf, size_t size) { void _buf_resize(struct buffer *buf, size_t size) {
if (size == buf->size) return;
free(buf->buf); free(buf->buf);
buf->buf = malloc(size); buf->buf = malloc(size);
if (!buf->buf) { if (!buf->buf) {

3
components/squeezelite/component.mk
View File

@@ -13,7 +13,8 @@ CFLAGS += -O3 -DLINKALL -DLOOPBACK -DNO_FAAD -DRESAMPLE16 -DEMBEDDED -DTREMOR_ON
-I$(COMPONENT_PATH)/../tools \ -I$(COMPONENT_PATH)/../tools \
-I$(COMPONENT_PATH)/../codecs/inc/opus \ -I$(COMPONENT_PATH)/../codecs/inc/opus \
-I$(COMPONENT_PATH)/../codecs/inc/opusfile \ -I$(COMPONENT_PATH)/../codecs/inc/opusfile \
-I$(COMPONENT_PATH)/../driver_bt -I$(COMPONENT_PATH)/../driver_bt \
-I$(COMPONENT_PATH)/../raop
# -I$(COMPONENT_PATH)/../codecs/inc/faad2 # -I$(COMPONENT_PATH)/../codecs/inc/faad2

6
components/squeezelite/decode.c
View File

@@ -117,6 +117,10 @@ static void *decode_thread() {
} }
} }
#if EMBEDDED
deregister_external();
#endif
return 0; return 0;
} }
@@ -200,7 +204,7 @@ void decode_init(log_level level, const char *include_codecs, const char *exclud
sort_codecs((include_codecs ? order_codecs - include_codecs : i), register_mpg()); sort_codecs((include_codecs ? order_codecs - include_codecs : i), register_mpg());
#if EMBEDDED #if EMBEDDED
register_other(); register_external();
#endif #endif
LOG_DEBUG("include codecs: %s exclude codecs: %s", include_codecs ? include_codecs : "", exclude_codecs); LOG_DEBUG("include codecs: %s exclude codecs: %s", include_codecs ? include_codecs : "", exclude_codecs);

141
components/squeezelite/decode_bt.c
View File

@@ -1,141 +0,0 @@
/*
* Squeezelite for esp32
*
* (c) Sebastien 2019
* Philippe G. 2019, philippe_44@outlook.com
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
#include "squeezelite.h"
#include "bt_app_sink.h"
#define LOCK_O mutex_lock(outputbuf->mutex)
#define UNLOCK_O mutex_unlock(outputbuf->mutex)
#define LOCK_D mutex_lock(decode.mutex);
#define UNLOCK_D mutex_unlock(decode.mutex);
extern struct outputstate output;
extern struct decodestate decode;
extern struct buffer *outputbuf;
// this is the only system-wide loglevel variable
extern log_level loglevel;
/****************************************************************************************
* BT sink data handler
*/
static void bt_sink_data_handler(const uint8_t *data, uint32_t len)
{
size_t bytes;
// would be better to lock decoder, but really, it does not matter
if (decode.state != DECODE_STOPPED) {
LOG_WARN("Cannot use BT sink while LMS is controlling player");
return;
}
// there will always be room at some point
while (len) {
LOCK_O;
bytes = min(len, _buf_cont_write(outputbuf));
#if BYTES_PER_FRAME == 4
memcpy(outputbuf->writep, data, bytes);
#else
{
s16_t *iptr = (s16_t*) data;
ISAMPLE_T *optr = (ISAMPLE_T*) outputbuf->writep;
size_t n = bytes / BYTES_PER_FRAME * 2;
while (n--) *optr++ = *iptr++ << 16;
}
#endif
_buf_inc_writep(outputbuf, bytes);
len -= bytes;
data += bytes;
UNLOCK_O;
// allow i2s to empty the buffer if needed
if (len) usleep(50000);
}
}
/****************************************************************************************
* BT sink command handler
*/
static void bt_sink_cmd_handler(bt_sink_cmd_t cmd, ...)
{
va_list args;
LOCK_D;
if (decode.state != DECODE_STOPPED) {
LOG_WARN("Cannot use BT sink while LMS is controlling player");
UNLOCK_D;
return;
}
va_start(args, cmd);
if (cmd != BT_SINK_VOLUME) LOCK_O;
switch(cmd) {
case BT_SINK_CONNECTED:
output.state = OUTPUT_STOPPED;
LOG_INFO("BT sink started");
break;
case BT_SINK_DISCONNECTED:
output.state = OUTPUT_OFF;
LOG_INFO("BT sink stopped");
break;
case BT_SINK_PLAY:
output.state = OUTPUT_EXTERNAL;
LOG_INFO("BT sink playing");
break;
case BT_SINK_PAUSE:
case BT_SINK_STOP:
output.state = OUTPUT_STOPPED;
LOG_INFO("BT sink stopped");
break;
case BT_SINK_RATE:
output.current_sample_rate = va_arg(args, u32_t);
LOG_INFO("Setting BT sample rate %u", output.current_sample_rate);
break;
case BT_SINK_VOLUME: {
u16_t volume = (u16_t) va_arg(args, u32_t);
volume *= 65536 / 128;
set_volume(volume, volume);
break;
}
}
if (cmd != BT_SINK_VOLUME) UNLOCK_O;
UNLOCK_D;
va_end(args);
}
/****************************************************************************************
* We provide the generic codec register option
*/
void register_other(void) {
#ifdef CONFIG_BT_SINK
if (!strcasestr(output.device, "BT ")) {
bt_sink_init(bt_sink_cmd_handler, bt_sink_data_handler);
LOG_INFO("Initializing BT sink");
} else {
LOG_WARN("Cannot be a BT sink and source");
}
#endif
}

18
components/squeezelite/embedded.h
View File

@@ -19,10 +19,10 @@
#define PTHREAD_STACK_MIN 256 #define PTHREAD_STACK_MIN 256
#endif #endif
#define STREAM_THREAD_STACK_SIZE 8 * 1024 #define STREAM_THREAD_STACK_SIZE 6 * 1024
#define DECODE_THREAD_STACK_SIZE 20 * 1024 #define DECODE_THREAD_STACK_SIZE 16 * 1024
#define OUTPUT_THREAD_STACK_SIZE 8 * 1024 #define OUTPUT_THREAD_STACK_SIZE 6 * 1024
#define IR_THREAD_STACK_SIZE 8 * 1024 #define IR_THREAD_STACK_SIZE 6 * 1024
//#define BASE_CAP "Model=squeezelite,AccuratePlayPoints=0,HasDigitalOut=1,HasPolarityInversion=1,Firmware=" VERSION //#define BASE_CAP "Model=squeezelite,AccuratePlayPoints=0,HasDigitalOut=1,HasPolarityInversion=1,Firmware=" VERSION
@@ -36,9 +36,13 @@ typedef unsigned long long u64_t;
#define gettime_ms _gettime_ms_ #define gettime_ms _gettime_ms_
#define mutex_create_p(m) mutex_create(m) #define mutex_create_p(m) mutex_create(m)
uint32_t _gettime_ms_(void); uint32_t _gettime_ms_(void);
int pthread_create_name(pthread_t *thread, _CONST pthread_attr_t *attr,
int pthread_create_name(pthread_t *thread, _CONST pthread_attr_t *attr,
void *(*start_routine)( void * ), void *arg, char *name); void *(*start_routine)( void * ), void *arg, char *name);
void register_other(void);
// these are here as they can be #define to nothing
void register_external(void);
void deregister_external(void);
#endif // EMBEDDED_H #endif // EMBEDDED_H

2
components/squeezelite/opus.c
View File

@@ -139,7 +139,7 @@ static decode_state opus_decompress(void) {
info = OP(u, head, u->of, -1); info = OP(u, head, u->of, -1);
LOCK_O; LOCK_O;
output.next_sample_rate = 48000; output.next_sample_rate = decode_newstream(48000, output.supported_rates);
IF_DSD( output.next_fmt = PCM; ) IF_DSD( output.next_fmt = PCM; )
output.track_start = outputbuf->writep; output.track_start = outputbuf->writep;
if (output.fade_mode) _checkfade(true); if (output.fade_mode) _checkfade(true);

1
components/squeezelite/output.c
View File

@@ -347,6 +347,7 @@ void output_init_common(log_level level, const char *device, unsigned output_buf
loglevel = level; loglevel = level;
output_buf_size = output_buf_size - (output_buf_size % BYTES_PER_FRAME); output_buf_size = output_buf_size - (output_buf_size % BYTES_PER_FRAME);
output.init_size = output_buf_size;
LOG_DEBUG("outputbuf size: %u", output_buf_size); LOG_DEBUG("outputbuf size: %u", output_buf_size);
buf_init(outputbuf, output_buf_size); buf_init(outputbuf, output_buf_size);

18
components/squeezelite/output_bt.c
View File

@@ -19,6 +19,7 @@
* *
*/ */
#include "driver/gpio.h"
#include "squeezelite.h" #include "squeezelite.h"
#include "perf_trace.h" #include "perf_trace.h"
@@ -38,10 +39,12 @@ extern u8_t *silencebuf;
extern void hal_bluetooth_init(const char * options); extern void hal_bluetooth_init(const char * options);
extern void hal_bluetooth_stop(void); extern void hal_bluetooth_stop(void);
extern u8_t config_spdif_gpio;
static log_level loglevel; static log_level loglevel;
static bool running = false; static bool running = false;
uint8_t * btout; static uint8_t *btout;
static frames_t oframes;
static int _write_frames(frames_t out_frames, bool silence, s32_t gainL, s32_t gainR, static int _write_frames(frames_t out_frames, bool silence, s32_t gainL, s32_t gainR,
s32_t cross_gain_in, s32_t cross_gain_out, ISAMPLE_T **cross_ptr); s32_t cross_gain_in, s32_t cross_gain_out, ISAMPLE_T **cross_ptr);
@@ -65,6 +68,11 @@ static int _write_frames(frames_t out_frames, bool silence, s32_t gainL, s32_t g
DECLARE_ALL_MIN_MAX; DECLARE_ALL_MIN_MAX;
void output_init_bt(log_level level, char *device, unsigned output_buf_size, char *params, unsigned rates[], unsigned rate_delay, unsigned idle) { void output_init_bt(log_level level, char *device, unsigned output_buf_size, char *params, unsigned rates[], unsigned rate_delay, unsigned idle) {
#ifdef CONFIG_SQUEEZEAMP
gpio_pad_select_gpio(config_spdif_gpio);
gpio_set_direction(config_spdif_gpio, GPIO_MODE_OUTPUT);
gpio_set_level(config_spdif_gpio, 0);
#endif
loglevel = level; loglevel = level;
running = true; running = true;
output.write_cb = &_write_frames; output.write_cb = &_write_frames;
@@ -94,12 +102,12 @@ static int _write_frames(frames_t out_frames, bool silence, s32_t gainL, s32_t g
} }
#if BYTES_PER_FRAME == 4 #if BYTES_PER_FRAME == 4
memcpy(btout, outputbuf->readp, out_frames * BYTES_PER_FRAME); memcpy(btout + oframes * BYTES_PER_FRAME, outputbuf->readp, out_frames * BYTES_PER_FRAME);
#else #else
{ {
frames_t count = out_frames; frames_t count = out_frames;
s32_t *_iptr = (s32_t*) outputbuf->readp; s32_t *_iptr = (s32_t*) outputbuf->readp;
s16_t *_optr = (s16_t*) bt_optr; s16_t *_optr = (s16_t*) (btout + oframes * BYTES_PER_FRAME);
while (count--) { while (count--) {
*_optr++ = *_iptr++ >> 16; *_optr++ = *_iptr++ >> 16;
*_optr++ = *_iptr++ >> 16; *_optr++ = *_iptr++ >> 16;
@@ -110,7 +118,7 @@ static int _write_frames(frames_t out_frames, bool silence, s32_t gainL, s32_t g
} else { } else {
u8_t *buf = silencebuf; u8_t *buf = silencebuf;
memcpy(btout, buf, out_frames * BYTES_PER_FRAME); memcpy(btout + oframes * BYTES_PER_FRAME, buf, out_frames * BYTES_PER_FRAME);
} }
return (int)out_frames; return (int)out_frames;
@@ -124,6 +132,7 @@ int32_t output_bt_data(uint8_t *data, int32_t len) {
} }
btout = data; btout = data;
oframes = 0;
// This is how the BTC layer calculates the number of bytes to // This is how the BTC layer calculates the number of bytes to
// for us to send. (BTC_SBC_DEC_PCM_DATA_LEN * sizeof(OI_INT16) - availPcmBytes // for us to send. (BTC_SBC_DEC_PCM_DATA_LEN * sizeof(OI_INT16) - availPcmBytes
@@ -143,6 +152,7 @@ int32_t output_bt_data(uint8_t *data, int32_t len) {
if (wanted_len > 0) { if (wanted_len > 0) {
SET_MIN_MAX(wanted_len, under); SET_MIN_MAX(wanted_len, under);
} }
output.frames_in_process = len-wanted_len;
UNLOCK; UNLOCK;
SET_MIN_MAX(TIME_MEASUREMENT_GET(start_timer),lock_out_time); SET_MIN_MAX(TIME_MEASUREMENT_GET(start_timer),lock_out_time);

76
components/squeezelite/output_i2s.c
View File

@@ -41,6 +41,7 @@ sure that using rate_delay would fix that
*/ */
#include "squeezelite.h" #include "squeezelite.h"
#include "esp_pthread.h"
#include "driver/i2s.h" #include "driver/i2s.h"
#include "driver/i2c.h" #include "driver/i2c.h"
#include "driver/gpio.h" #include "driver/gpio.h"
@@ -84,9 +85,9 @@ sure that using rate_delay would fix that
typedef enum { DAC_ON = 0, DAC_OFF, DAC_POWERDOWN, DAC_VOLUME } dac_cmd_e; typedef enum { DAC_ON = 0, DAC_OFF, DAC_POWERDOWN, DAC_VOLUME } dac_cmd_e;
// must have an integer ratio with FRAME_BLOCK // must have an integer ratio with FRAME_BLOCK (see spdif comment)
#define DMA_BUF_LEN 512 #define DMA_BUF_LEN 512
#define DMA_BUF_COUNT 16 #define DMA_BUF_COUNT 12
#define DECLARE_ALL_MIN_MAX \ #define DECLARE_ALL_MIN_MAX \
DECLARE_MIN_MAX(o); \ DECLARE_MIN_MAX(o); \
@@ -115,7 +116,9 @@ static i2s_config_t i2s_config;
static int bytes_per_frame; static int bytes_per_frame;
static thread_type thread, stats_thread; static thread_type thread, stats_thread;
static u8_t *obuf; static u8_t *obuf;
static frames_t oframes;
static bool spdif; static bool spdif;
static size_t dma_buf_frames;
DECLARE_ALL_MIN_MAX; DECLARE_ALL_MIN_MAX;
@@ -151,13 +154,15 @@ static void spdif_convert(ISAMPLE_T *src, size_t frames, u32_t *dst, size_t *cou
#define I2C_PORT 0 #define I2C_PORT 0
#define I2C_ADDR 0x4c #define I2C_ADDR 0x4c
#define VOLUME_GPIO 33 #define VOLUME_GPIO 33
#define JACK_GPIO 39 #define JACK_GPIO 34
struct tas575x_cmd_s { struct tas575x_cmd_s {
u8_t reg; u8_t reg;
u8_t value; u8_t value;
}; };
u8_t config_spdif_gpio = CONFIG_SPDIF_DO_IO;
static const struct tas575x_cmd_s tas575x_init_sequence[] = { static const struct tas575x_cmd_s tas575x_init_sequence[] = {
{ 0x00, 0x00 }, // select page 0 { 0x00, 0x00 }, // select page 0
{ 0x02, 0x10 }, // standby { 0x02, 0x10 }, // standby
@@ -194,7 +199,7 @@ void output_init_i2s(log_level level, char *device, unsigned output_buf_size, ch
gpio_set_direction(JACK_GPIO, GPIO_MODE_INPUT); gpio_set_direction(JACK_GPIO, GPIO_MODE_INPUT);
adc1_config_width(ADC_WIDTH_BIT_12); adc1_config_width(ADC_WIDTH_BIT_12);
adc1_config_channel_atten(ADC1_CHANNEL_0,ADC_ATTEN_DB_0); adc1_config_channel_atten(ADC1_CHANNEL_7, ADC_ATTEN_DB_0);
// init volume & mute // init volume & mute
gpio_pad_select_gpio(VOLUME_GPIO); gpio_pad_select_gpio(VOLUME_GPIO);
@@ -266,12 +271,25 @@ void output_init_i2s(log_level level, char *device, unsigned output_buf_size, ch
}; };
i2s_config.sample_rate = output.current_sample_rate * 2; i2s_config.sample_rate = output.current_sample_rate * 2;
i2s_config.bits_per_sample = 32; i2s_config.bits_per_sample = 32;
// Normally counted in frames, but 16 sample are transformed into 32 bits in spdif
i2s_config.dma_buf_len = DMA_BUF_LEN / 2;
i2s_config.dma_buf_count = DMA_BUF_COUNT * 2;
/*
In DMA, we have room for (LEN * COUNT) frames of 32 bits samples that
we push at sample_rate * 2. Each of these peuso-frames is a single true
audio frame. So the real depth is true frames is (LEN * COUNT / 2)
*/
dma_buf_frames = DMA_BUF_COUNT * DMA_BUF_LEN / 2;
} else { } else {
pin_config = (i2s_pin_config_t) { .bck_io_num = CONFIG_I2S_BCK_IO, .ws_io_num = CONFIG_I2S_WS_IO, pin_config = (i2s_pin_config_t) { .bck_io_num = CONFIG_I2S_BCK_IO, .ws_io_num = CONFIG_I2S_WS_IO,
.data_out_num = CONFIG_I2S_DO_IO, .data_in_num = -1 //Not used .data_out_num = CONFIG_I2S_DO_IO, .data_in_num = -1 //Not used
}; };
i2s_config.sample_rate = output.current_sample_rate; i2s_config.sample_rate = output.current_sample_rate;
i2s_config.bits_per_sample = bytes_per_frame * 8 / 2; i2s_config.bits_per_sample = bytes_per_frame * 8 / 2;
// Counted in frames (but i2s allocates a buffer <= 4092 bytes)
i2s_config.dma_buf_len = DMA_BUF_LEN;
i2s_config.dma_buf_count = DMA_BUF_COUNT;
dma_buf_frames = DMA_BUF_COUNT * DMA_BUF_LEN;
#ifdef TAS575x #ifdef TAS575x
gpio_pad_select_gpio(CONFIG_SPDIF_DO_IO); gpio_pad_select_gpio(CONFIG_SPDIF_DO_IO);
gpio_set_direction(CONFIG_SPDIF_DO_IO, GPIO_MODE_OUTPUT); gpio_set_direction(CONFIG_SPDIF_DO_IO, GPIO_MODE_OUTPUT);
@@ -284,9 +302,6 @@ void output_init_i2s(log_level level, char *device, unsigned output_buf_size, ch
i2s_config.communication_format = I2S_COMM_FORMAT_I2S| I2S_COMM_FORMAT_I2S_MSB; i2s_config.communication_format = I2S_COMM_FORMAT_I2S| I2S_COMM_FORMAT_I2S_MSB;
// in case of overflow, do not replay old buffer // in case of overflow, do not replay old buffer
i2s_config.tx_desc_auto_clear = true; i2s_config.tx_desc_auto_clear = true;
i2s_config.dma_buf_count = DMA_BUF_COUNT;
// Counted in frames (but i2s allocates a buffer <= 4092 bytes)
i2s_config.dma_buf_len = DMA_BUF_LEN;
i2s_config.use_apll = true; i2s_config.use_apll = true;
i2s_config.intr_alloc_flags = ESP_INTR_FLAG_LEVEL1; //Interrupt level 1 i2s_config.intr_alloc_flags = ESP_INTR_FLAG_LEVEL1; //Interrupt level 1
@@ -302,14 +317,20 @@ void output_init_i2s(log_level level, char *device, unsigned output_buf_size, ch
dac_cmd(DAC_OFF); dac_cmd(DAC_OFF);
pthread_attr_t attr; esp_pthread_cfg_t cfg = esp_pthread_get_default_config();
pthread_attr_init(&attr);
pthread_attr_setstacksize(&attr, PTHREAD_STACK_MIN + OUTPUT_THREAD_STACK_SIZE);
pthread_create_name(&thread, &attr, output_thread_i2s, NULL, "output_i2s");
pthread_attr_destroy(&attr);
// leave stack size to default cfg.thread_name= "output_i2s";
pthread_create_name(&stats_thread, NULL, output_thread_i2s_stats, NULL, "output_i2s_sts"); cfg.inherit_cfg = false;
cfg.prio = CONFIG_ESP32_PTHREAD_TASK_PRIO_DEFAULT + 1;
cfg.stack_size = PTHREAD_STACK_MIN + OUTPUT_THREAD_STACK_SIZE;
esp_pthread_set_cfg(&cfg);
pthread_create(&thread, NULL, output_thread_i2s, NULL);
cfg.thread_name= "output_i2s_sts";
cfg.prio = CONFIG_ESP32_PTHREAD_TASK_PRIO_DEFAULT - 1;
cfg.stack_size = 2048;
esp_pthread_set_cfg(&cfg);
pthread_create(&stats_thread, NULL, output_thread_i2s_stats, NULL);
} }
@@ -361,13 +382,13 @@ static int _i2s_write_frames(frames_t out_frames, bool silence, s32_t gainL, s32
_apply_gain(outputbuf, out_frames, gainL, gainR); _apply_gain(outputbuf, out_frames, gainL, gainR);
} }
memcpy(obuf, outputbuf->readp, out_frames * bytes_per_frame); memcpy(obuf + oframes * bytes_per_frame, outputbuf->readp, out_frames * bytes_per_frame);
#else #else
optr = (s32_t*) outputbuf->readp; optr = (s32_t*) outputbuf->readp;
#endif #endif
} else { } else {
#if BYTES_PER_FRAME == 4 #if BYTES_PER_FRAME == 4
memcpy(obuf, silencebuf, out_frames * bytes_per_frame); memcpy(obuf + oframes * bytes_per_frame, silencebuf, out_frames * bytes_per_frame);
#else #else
optr = (s32_t*) silencebuf; optr = (s32_t*) silencebuf;
#endif #endif
@@ -381,19 +402,20 @@ static int _i2s_write_frames(frames_t out_frames, bool silence, s32_t gainL, s32
dsd_invert((u32_t *) optr, out_frames); dsd_invert((u32_t *) optr, out_frames);
) )
_scale_and_pack_frames(obuf, optr, out_frames, gainL, gainR, output.format); _scale_and_pack_frames(obuf + oframes * bytes_per_frame, optr, out_frames, gainL, gainR, output.format);
#endif #endif
oframes += out_frames;
return out_frames; return out_frames;
} }
/**************************************************************************************** /****************************************************************************************
* Main output thread * Main output thread
*/ */
static void *output_thread_i2s() { static void *output_thread_i2s() {
size_t count = 0, bytes; size_t count = 0, bytes;
frames_t iframes = FRAME_BLOCK, oframes; frames_t iframes = FRAME_BLOCK;
uint32_t timer_start = 0; uint32_t timer_start = 0;
int discard = 0; int discard = 0;
uint32_t fullness = gettime_ms(); uint32_t fullness = gettime_ms();
@@ -435,11 +457,14 @@ static void *output_thread_i2s() {
synced = false; synced = false;
} }
oframes = 0;
output.updated = gettime_ms(); output.updated = gettime_ms();
output.frames_played_dmp = output.frames_played; output.frames_played_dmp = output.frames_played;
// try to estimate how much we have consumed from the DMA buffer // try to estimate how much we have consumed from the DMA buffer (calculation is incorrect at the very beginning ...)
output.device_frames = DMA_BUF_COUNT * DMA_BUF_LEN - ((output.updated - fullness) * output.current_sample_rate) / 1000; output.device_frames = dma_buf_frames - ((output.updated - fullness) * output.current_sample_rate) / 1000;
oframes = _output_frames( iframes ); _output_frames( iframes );
// oframes must be a global updated by the write callback
output.frames_in_process = oframes;
SET_MIN_MAX_SIZED(oframes,rec,iframes); SET_MIN_MAX_SIZED(oframes,rec,iframes);
SET_MIN_MAX_SIZED(_buf_used(outputbuf),o,outputbuf->size); SET_MIN_MAX_SIZED(_buf_used(outputbuf),o,outputbuf->size);
@@ -517,7 +542,7 @@ static void *output_thread_i2s() {
static void *output_thread_i2s_stats() { static void *output_thread_i2s_stats() {
while (running) { while (running) {
#ifdef TAS575x #ifdef TAS575x
LOG_ERROR("Jack %d Voltage %.2fV", !gpio_get_level(JACK_GPIO), adc1_get_raw(ADC1_CHANNEL_0) / 4095. * (10+169)/10. * 1.1); LOG_ERROR("Jack %d Voltage %.2fV", !gpio_get_level(JACK_GPIO), adc1_get_raw(ADC1_CHANNEL_7) / 4095. * (10+174)/10. * 1.1);
#endif #endif
LOCK; LOCK;
output_state state = output.state; output_state state = output.state;
@@ -542,6 +567,11 @@ static void *output_thread_i2s_stats() {
LOG_INFO(" ----------+----------+-----------+-----------+"); LOG_INFO(" ----------+----------+-----------+-----------+");
RESET_ALL_MIN_MAX; RESET_ALL_MIN_MAX;
} }
LOG_INFO("Heap internal:%zu (min:%zu) external:%zu (min:%zu)",
heap_caps_get_free_size(MALLOC_CAP_INTERNAL),
heap_caps_get_minimum_free_size(MALLOC_CAP_INTERNAL),
heap_caps_get_free_size(MALLOC_CAP_SPIRAM),
heap_caps_get_minimum_free_size(MALLOC_CAP_SPIRAM));
usleep(STATS_PERIOD_MS *1000); usleep(STATS_PERIOD_MS *1000);
} }
return NULL; return NULL;

7
components/squeezelite/slimproto.c
View File

@@ -371,6 +371,8 @@ static void process_strm(u8_t *pkt, int len) {
sendSTAT("STMc", 0); sendSTAT("STMc", 0);
sentSTMu = sentSTMo = sentSTMl = false; sentSTMu = sentSTMo = sentSTMl = false;
LOCK_O; LOCK_O;
output.external = false;
_buf_resize(outputbuf, output.init_size);
output.threshold = strm->output_threshold; output.threshold = strm->output_threshold;
output.next_replay_gain = unpackN(&strm->replay_gain); output.next_replay_gain = unpackN(&strm->replay_gain);
output.fade_mode = strm->transition_type - '0'; output.fade_mode = strm->transition_type - '0';
@@ -629,7 +631,6 @@ static void slimproto_run() {
#endif #endif
last = now; last = now;
LOCK_S; LOCK_S;
status.stream_full = _buf_used(streambuf); status.stream_full = _buf_used(streambuf);
status.stream_size = streambuf->size; status.stream_size = streambuf->size;
@@ -703,7 +704,7 @@ static void slimproto_run() {
if (_start_output && (output.state == OUTPUT_STOPPED || output.state == OUTPUT_OFF)) { if (_start_output && (output.state == OUTPUT_STOPPED || output.state == OUTPUT_OFF)) {
output.state = OUTPUT_BUFFER; output.state = OUTPUT_BUFFER;
} }
if (output.state == OUTPUT_RUNNING && !sentSTMu && status.output_full == 0 && status.stream_state <= DISCONNECT && if (!output.external && output.state == OUTPUT_RUNNING && !sentSTMu && status.output_full == 0 && status.stream_state <= DISCONNECT &&
_decode_state == DECODE_STOPPED) { _decode_state == DECODE_STOPPED) {
_sendSTMu = true; _sendSTMu = true;
@@ -721,7 +722,7 @@ static void slimproto_run() {
output.state = OUTPUT_OFF; output.state = OUTPUT_OFF;
LOG_DEBUG("output timeout"); LOG_DEBUG("output timeout");
} }
if (output.state == OUTPUT_RUNNING && now - status.last > 1000) { if (!output.external && output.state == OUTPUT_RUNNING && now - status.last > 1000) {
_sendSTMt = true; _sendSTMt = true;
status.last = now; status.last = now;
} }

6
components/squeezelite/squeezelite.h
View File

@@ -539,6 +539,7 @@ unsigned _buf_cont_write(struct buffer *buf);
void _buf_inc_readp(struct buffer *buf, unsigned by); void _buf_inc_readp(struct buffer *buf, unsigned by);
void _buf_inc_writep(struct buffer *buf, unsigned by); void _buf_inc_writep(struct buffer *buf, unsigned by);
void buf_flush(struct buffer *buf); void buf_flush(struct buffer *buf);
void _buf_flush(struct buffer *buf);
void buf_adjust(struct buffer *buf, size_t mod); void buf_adjust(struct buffer *buf, size_t mod);
void _buf_resize(struct buffer *buf, size_t size); void _buf_resize(struct buffer *buf, size_t size);
void buf_init(struct buffer *buf, size_t size); void buf_init(struct buffer *buf, size_t size);
@@ -634,7 +635,7 @@ bool resample_init(char *opt);
// output.c output_alsa.c output_pa.c output_pack.c // output.c output_alsa.c output_pa.c output_pack.c
typedef enum { OUTPUT_OFF = -1, OUTPUT_STOPPED = 0, OUTPUT_BUFFER, OUTPUT_RUNNING, typedef enum { OUTPUT_OFF = -1, OUTPUT_STOPPED = 0, OUTPUT_BUFFER, OUTPUT_RUNNING,
OUTPUT_PAUSE_FRAMES, OUTPUT_SKIP_FRAMES, OUTPUT_START_AT, OUTPUT_EXTERNAL } output_state; OUTPUT_PAUSE_FRAMES, OUTPUT_SKIP_FRAMES, OUTPUT_START_AT } output_state;
#if DSD #if DSD
typedef enum { PCM, DOP, DSD_U8, DSD_U16_LE, DSD_U32_LE, DSD_U16_BE, DSD_U32_BE, DOP_S24_LE, DOP_S24_3LE } dsd_format; typedef enum { PCM, DOP, DSD_U8, DSD_U16_LE, DSD_U32_LE, DSD_U16_BE, DSD_U32_BE, DOP_S24_LE, DOP_S24_3LE } dsd_format;
@@ -654,6 +655,8 @@ struct outputstate {
output_state state; output_state state;
output_format format; output_format format;
const char *device; const char *device;
bool external;
u32_t init_size;
#if ALSA #if ALSA
unsigned buffer; unsigned buffer;
unsigned period; unsigned period;
@@ -673,6 +676,7 @@ struct outputstate {
unsigned default_sample_rate; unsigned default_sample_rate;
bool error_opening; bool error_opening;
unsigned device_frames; unsigned device_frames;
unsigned frames_in_process;
u32_t updated; u32_t updated;
u32_t track_start_time; u32_t track_start_time;
u32_t current_replay_gain; u32_t current_replay_gain;

2
main/CMakeLists.txt
View File

@@ -1,6 +1,6 @@
set(COMPONENT_ADD_INCLUDEDIRS . ) set(COMPONENT_ADD_INCLUDEDIRS . )
set(COMPONENT_SRCS "esp_app_main.c" "platform_esp32.c" "cmd_wifi.c" "console.c" "nvs_utilities.c" "cmd_squeezelite.c") set(COMPONENT_SRCS "esp_app_main.c" "platform_esp32.c" "cmd_wifi.c" "console.c" "nvs_utilities.c" "cmd_squeezelite.c" )
set(REQUIRES esp_common ) set(REQUIRES esp_common )
set(REQUIRES_COMPONENTS freertos nvs_flash esp32 spi_flash newlib log console wifi-manager ) set(REQUIRES_COMPONENTS freertos nvs_flash esp32 spi_flash newlib log console wifi-manager )

18
main/Kconfig.projbuild
View File

@@ -229,7 +229,7 @@ menu "Squeezelite-ESP32"
config BT_SINK_NAME config BT_SINK_NAME
depends on BT_SINK depends on BT_SINK
string "Name of Bluetooth A2DP device" string "Name of Bluetooth A2DP device"
default "ESP32" default "ESP32-BT"
help help
This is the name of the bluetooth speaker that will be broadcasted This is the name of the bluetooth speaker that will be broadcasted
config BT_SINK_PIN config BT_SINK_PIN
@@ -237,8 +237,20 @@ menu "Squeezelite-ESP32"
int "Bluetooth PIN code" int "Bluetooth PIN code"
default 1234 default 1234
config AIRPLAY_SINK config AIRPLAY_SINK
bool "AirPlay receiver (not availabe now)" bool "AirPlay receiver"
default n default y
config AIRPLAY_NAME
depends on AIRPLAY_SINK
string "Name of AirPlay device"
default "ESP32-AirPlay"
help
This is the name of the AirPlay speaker that will be broadcasted
config AIRPLAY_PORT
depends on AIRPLAY_SINK
string "AirPlay listening port"
default 5000
help
AirPlay service listening port
endmenu endmenu
endmenu endmenu

2
main/cmd_squeezelite.c
View File

@@ -17,7 +17,7 @@
#include "nvs_flash.h" #include "nvs_flash.h"
//extern char current_namespace[]; //extern char current_namespace[];
static const char * TAG = "squeezelite_cmd"; static const char * TAG = "squeezelite_cmd";
#define SQUEEZELITE_THREAD_STACK_SIZE 8192 #define SQUEEZELITE_THREAD_STACK_SIZE (6*1024)
extern int main(int argc, char **argv); extern int main(int argc, char **argv);
static int launchsqueezelite(int argc, char **argv); static int launchsqueezelite(int argc, char **argv);
pthread_t thread_squeezelite; pthread_t thread_squeezelite;

7
main/console.c
View File

@@ -29,7 +29,6 @@
#include "cmd_squeezelite.h" #include "cmd_squeezelite.h"
#include "nvs_utilities.h" #include "nvs_utilities.h"
pthread_t thread_console; pthread_t thread_console;
static void * console_thread(); static void * console_thread();
void console_start(); void console_start();
static const char * TAG = "console"; static const char * TAG = "console";
@@ -146,12 +145,9 @@ void process_autoexec(){
{ {
ESP_LOGD(TAG,"No matching command found for name autoexec. Adding default entries"); ESP_LOGD(TAG,"No matching command found for name autoexec. Adding default entries");
uint8_t autoexec_dft=0; uint8_t autoexec_dft=0;
//char autoexec1_dft[64]; char autoexec1_dft[256]="squeezelite -o \"I2S\" -b 500:2000 -d all=info -M esp32";
char autoexec1_dft[]="squeezelite -o \"I2S\" -b 500:2000 -d all=info -M esp32";
//snprintf(autoexec1_dft, 64, "join %s %s", CONFIG_WIFI_SSID, CONFIG_WIFI_PASSWORD);
store_nvs_value(NVS_TYPE_U8,"autoexec",&autoexec_dft); store_nvs_value(NVS_TYPE_U8,"autoexec",&autoexec_dft);
store_nvs_value(NVS_TYPE_STR,"autoexec1",autoexec1_dft); store_nvs_value(NVS_TYPE_STR,"autoexec1",autoexec1_dft);
//store_nvs_value(NVS_TYPE_STR,"autoexec2",autoexec2_dft);
} }
} }
static void initialize_filesystem() { static void initialize_filesystem() {
@@ -276,7 +272,6 @@ void console_start() {
pthread_attr_t attr; pthread_attr_t attr;
pthread_attr_init(&attr); pthread_attr_init(&attr);
pthread_create(&thread_console, &attr, console_thread, NULL); pthread_create(&thread_console, &attr, console_thread, NULL);
pthread_attr_destroy(&attr); pthread_attr_destroy(&attr);
} }
void run_command(char * line){ void run_command(char * line){

14
partitions.csv
View File

@@ -1,7 +1,7 @@
nvs, data, nvs, 0x9000, 0x4000, # Name, Type, SubType, Offset, Size, Flags
otadata, data, ota, 0xD000, 0x2000, # Note: if you change the phy_init or app partition offset, make sure to change the offset in Kconfig.projbuild
phy_init, data, phy, 0xF000, 0x1000, nvs, data, nvs, 0x9000, 0x6000,
factory, app, factory, 0x10000, 0x140000, phy_init, data, phy, 0xf000, 0x1000,
ota_0, app, ota_0, 0x150000, 0x270000, factory, app, factory, 0x10000, 2M,
coredump, data, coredump, 0x3C0000, 0x10000, storage, data, fat, , 819200,
storage, data, fat, 0x3D0000, 0x30000, coredump, data, coredump,, 64K
1 nvs # Name, Type, SubType, Offset, Size, Flags data nvs 0x9000 0x4000
2 otadata # Note: if you change the phy_init or app partition offset, make sure to change the offset in Kconfig.projbuild data ota 0xD000 0x2000
3 phy_init nvs, data, nvs, 0x9000, 0x6000, data phy 0xF000 0x1000
4 factory phy_init, data, phy, 0xf000, 0x1000, app factory 0x10000 0x140000
5 ota_0 factory, app, factory, 0x10000, 2M, app ota_0 0x150000 0x270000
6 coredump storage, data, fat, , 819200, data coredump 0x3C0000 0x10000
7 storage coredump, data, coredump,, 64K data fat 0x3D0000 0x30000