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

Can't set NDEBUG with bluedroid (compiler optimization bug) + remove code when BT/AirPlay are not used

Browse Source
This commit is contained in:
Philippe G
2021-11-26 18:07:20 -08:00
parent ec860480a9
commit bbca38aaec
5 changed files with 74 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build-scripts/ESP32-A1S-sdkconfig.defaults
View File

@@ -130,8 +130,8 @@ CONFIG_DEFAULT_AP_BEACON_INTERVAL=100
CONFIG_DEFAULT_COMMAND_LINE="squeezelite -o I2S -b 500:2000 -d all=info -C 30 -W" CONFIG_DEFAULT_COMMAND_LINE="squeezelite -o I2S -b 500:2000 -d all=info -C 30 -W"
# CONFIG_COMPILER_OPTIMIZATION_LEVEL_DEBUG is not set # CONFIG_COMPILER_OPTIMIZATION_LEVEL_DEBUG is not set
CONFIG_COMPILER_OPTIMIZATION_LEVEL_RELEASE=y CONFIG_COMPILER_OPTIMIZATION_LEVEL_RELEASE=y
CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_ENABLE=y # CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_ENABLE is not set
# CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT is not set CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT=y
# CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE is not set # CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE is not set
CONFIG_COMPILER_CXX_EXCEPTIONS=y CONFIG_COMPILER_CXX_EXCEPTIONS=y
CONFIG_COMPILER_CXX_EXCEPTIONS_EMG_POOL_SIZE=0 CONFIG_COMPILER_CXX_EXCEPTIONS_EMG_POOL_SIZE=0

4
build-scripts/I2S-4MFlash-sdkconfig.defaults
View File

@@ -129,8 +129,8 @@ CONFIG_DEFAULT_AP_BEACON_INTERVAL=100
CONFIG_DEFAULT_COMMAND_LINE="squeezelite -o I2S -b 500:2000 -d all=info -C 30 -W" CONFIG_DEFAULT_COMMAND_LINE="squeezelite -o I2S -b 500:2000 -d all=info -C 30 -W"
# CONFIG_COMPILER_OPTIMIZATION_LEVEL_DEBUG is not set # CONFIG_COMPILER_OPTIMIZATION_LEVEL_DEBUG is not set
CONFIG_COMPILER_OPTIMIZATION_LEVEL_RELEASE=y CONFIG_COMPILER_OPTIMIZATION_LEVEL_RELEASE=y
CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_ENABLE=y # CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_ENABLE is not set
# CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT is not set CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT=y
# CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE is not set # CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE is not set
CONFIG_COMPILER_CXX_EXCEPTIONS=y CONFIG_COMPILER_CXX_EXCEPTIONS=y
CONFIG_COMPILER_CXX_EXCEPTIONS_EMG_POOL_SIZE=0 CONFIG_COMPILER_CXX_EXCEPTIONS_EMG_POOL_SIZE=0

4
build-scripts/SqueezeAmp-sdkconfig.defaults
View File

@@ -129,8 +129,8 @@ CONFIG_DEFAULT_AP_BEACON_INTERVAL=100
CONFIG_DEFAULT_COMMAND_LINE="squeezelite -o I2S -b 500:2000 -d all=info -C 30 -W" CONFIG_DEFAULT_COMMAND_LINE="squeezelite -o I2S -b 500:2000 -d all=info -C 30 -W"
# CONFIG_COMPILER_OPTIMIZATION_LEVEL_DEBUG is not set # CONFIG_COMPILER_OPTIMIZATION_LEVEL_DEBUG is not set
CONFIG_COMPILER_OPTIMIZATION_LEVEL_RELEASE=y CONFIG_COMPILER_OPTIMIZATION_LEVEL_RELEASE=y
CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_ENABLE=y # CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_ENABLE is not set
# CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT is not set CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT=y
# CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE is not set # CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE is not set
CONFIG_COMPILER_CXX_EXCEPTIONS=y CONFIG_COMPILER_CXX_EXCEPTIONS=y
CONFIG_COMPILER_CXX_EXCEPTIONS_EMG_POOL_SIZE=0 CONFIG_COMPILER_CXX_EXCEPTIONS_EMG_POOL_SIZE=0

57
components/squeezelite/decode_external.c
View File

@@ -11,24 +11,15 @@
#include "platform_config.h" #include "platform_config.h"
#include "squeezelite.h" #include "squeezelite.h"
#include "bt_app_sink.h"
#include "raop_sink.h"
#include <math.h> #include <math.h>
#define LOCK_O mutex_lock(outputbuf->mutex) #if CONFIG_BT_SINK
#define UNLOCK_O mutex_unlock(outputbuf->mutex) #include "bt_app_sink.h"
#define LOCK_D mutex_lock(decode.mutex);
#define UNLOCK_D mutex_unlock(decode.mutex);
enum { DECODE_BT = 1, DECODE_RAOP };
extern struct outputstate output;
extern struct decodestate decode;
extern struct buffer *outputbuf;
// this is the only system-wide loglevel variable
extern log_level loglevel;
static bool enable_bt_sink; static bool enable_bt_sink;
#endif
#if CONFIG_AIRPLAY_SINK
#include "raop_sink.h"
static bool enable_airplay; static bool enable_airplay;
#define RAOP_OUTPUT_SIZE (((RAOP_SAMPLE_RATE * BYTES_PER_FRAME * 2 * 120) / 100) & ~BYTES_PER_FRAME) #define RAOP_OUTPUT_SIZE (((RAOP_SAMPLE_RATE * BYTES_PER_FRAME * 2 * 120) / 100) & ~BYTES_PER_FRAME)
@@ -44,6 +35,20 @@ static EXT_RAM_ATTR struct {
s32_t len; s32_t len;
u32_t start_time, playtime; u32_t start_time, playtime;
} raop_sync; } raop_sync;
#endif
#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);
enum { DECODE_BT = 1, DECODE_RAOP};
extern struct outputstate output;
extern struct decodestate decode;
extern struct buffer *outputbuf;
// this is the only system-wide loglevel variable
extern log_level loglevel;
/**************************************************************************************** /****************************************************************************************
* Common sink data handler * Common sink data handler
@@ -95,7 +100,7 @@ static void sink_data_handler(const uint8_t *data, uint32_t len)
/**************************************************************************************** /****************************************************************************************
* BT sink command handler * BT sink command handler
*/ */
#if CONFIG_BT_SINK
static bool bt_sink_cmd_handler(bt_sink_cmd_t cmd, va_list args) static bool bt_sink_cmd_handler(bt_sink_cmd_t cmd, va_list args)
{ {
// don't LOCK_O as there is always a chance that LMS takes control later anyway // don't LOCK_O as there is always a chance that LMS takes control later anyway
@@ -158,10 +163,12 @@ static bool bt_sink_cmd_handler(bt_sink_cmd_t cmd, va_list args)
return true; return true;
} }
#endif
/**************************************************************************************** /****************************************************************************************
* raop sink data handler * raop sink data handler
*/ */
#if CONFIG_AIRPLAY_SINK
static void raop_sink_data_handler(const uint8_t *data, uint32_t len, u32_t playtime) { static void raop_sink_data_handler(const uint8_t *data, uint32_t len, u32_t playtime) {
raop_sync.playtime = playtime; raop_sync.playtime = playtime;
@@ -292,6 +299,7 @@ static bool raop_sink_cmd_handler(raop_event_t event, va_list args)
UNLOCK_D; UNLOCK_D;
return true; return true;
} }
#endif
/**************************************************************************************** /****************************************************************************************
* We provide the generic codec register option * We provide the generic codec register option
@@ -299,16 +307,21 @@ static bool raop_sink_cmd_handler(raop_event_t event, va_list args)
void register_external(void) { void register_external(void) {
char *p; char *p;
#if CONFIG_BT_SINK
if ((p = config_alloc_get(NVS_TYPE_STR, "enable_bt_sink")) != NULL) { if ((p = config_alloc_get(NVS_TYPE_STR, "enable_bt_sink")) != NULL) {
enable_bt_sink = strcmp(p,"1") == 0 || strcasecmp(p,"y") == 0; enable_bt_sink = strcmp(p,"1") == 0 || strcasecmp(p,"y") == 0;
free(p); free(p);
} }
#endif
#if CONFIG_AIRPLAY_SINK
if ((p = config_alloc_get(NVS_TYPE_STR, "enable_airplay")) != NULL) { if ((p = config_alloc_get(NVS_TYPE_STR, "enable_airplay")) != NULL) {
enable_airplay = strcmp(p,"1") == 0 || strcasecmp(p,"y") == 0; enable_airplay = strcmp(p,"1") == 0 || strcasecmp(p,"y") == 0;
free(p); free(p);
} }
#endif
#if CONFIG_BT_SINK
if (!strcasestr(output.device, "BT ") ) { if (!strcasestr(output.device, "BT ") ) {
if(enable_bt_sink){ if(enable_bt_sink){
bt_sink_init(bt_sink_cmd_handler, sink_data_handler); bt_sink_init(bt_sink_cmd_handler, sink_data_handler);
@@ -317,32 +330,44 @@ void register_external(void) {
} else { } else {
LOG_WARN("Cannot be a BT sink and source"); LOG_WARN("Cannot be a BT sink and source");
} }
#endif
#if CONFIG_AIRPLAY_SINK
if (enable_airplay){ if (enable_airplay){
raop_sink_init(raop_sink_cmd_handler, raop_sink_data_handler); raop_sink_init(raop_sink_cmd_handler, raop_sink_data_handler);
LOG_INFO("Initializing AirPlay sink"); LOG_INFO("Initializing AirPlay sink");
} }
#endif
} }
void deregister_external(void) { void deregister_external(void) {
#if CONFIG_BT_SINK
if (!strcasestr(output.device, "BT ") && enable_bt_sink) { if (!strcasestr(output.device, "BT ") && enable_bt_sink) {
LOG_INFO("Stopping BT sink"); LOG_INFO("Stopping BT sink");
bt_sink_deinit(); bt_sink_deinit();
} }
#endif
#if CONFIG_AIRPLAY_SINK
if (enable_airplay){ if (enable_airplay){
LOG_INFO("Stopping AirPlay sink"); LOG_INFO("Stopping AirPlay sink");
raop_sink_deinit(); raop_sink_deinit();
} }
#endif
} }
void decode_restore(int external) { void decode_restore(int external) {
switch (external) { switch (external) {
#if CONFIG_BT_SINK
case DECODE_BT: case DECODE_BT:
bt_disconnect(); bt_disconnect();
break; break;
#endif
#if CONFIG_AIRPLAY_SINK
case DECODE_RAOP: case DECODE_RAOP:
raop_disconnect(); raop_disconnect();
raop_state = RAOP_STOP; raop_state = RAOP_STOP;
break; break;
#endif
} }
} }

44
main/esp_app_main.c
View File

@@ -264,18 +264,37 @@ void register_default_nvs(){
esp_read_mac((uint8_t *)&mac, ESP_MAC_WIFI_STA); esp_read_mac((uint8_t *)&mac, ESP_MAC_WIFI_STA);
snprintf(macStr, LOCAL_MAC_SIZE-1,"-%x%x%x", mac[3], mac[4], mac[5]); snprintf(macStr, LOCAL_MAC_SIZE-1,"-%x%x%x", mac[3], mac[4], mac[5]);
DEFAULT_NAME_WITH_MAC(default_bt_name,CONFIG_BT_NAME);
ESP_LOGD(TAG,"Registering default value for key %s, value %s", "bt_name", default_bt_name);
config_set_default(NVS_TYPE_STR, "bt_name", default_bt_name, 0);
DEFAULT_NAME_WITH_MAC(default_host_name,DEFAULT_HOST_NAME); DEFAULT_NAME_WITH_MAC(default_host_name,DEFAULT_HOST_NAME);
ESP_LOGD(TAG,"Registering default value for key %s, value %s", "host_name", default_host_name); ESP_LOGD(TAG,"Registering default value for key %s, value %s", "host_name", default_host_name);
config_set_default(NVS_TYPE_STR, "host_name", default_host_name, 0); config_set_default(NVS_TYPE_STR, "host_name", default_host_name, 0);
#if CONFIG_BT_SINK
DEFAULT_NAME_WITH_MAC(default_bt_name,CONFIG_BT_NAME);
ESP_LOGD(TAG,"Registering default value for key %s, value %s", "bt_name", default_bt_name);
config_set_default(NVS_TYPE_STR, "bt_name", default_bt_name, 0);
ESP_LOGD(TAG,"Registering default value for key %s, value %s", "enable_bt_sink", STR(CONFIG_BT_SINK));
config_set_default(NVS_TYPE_STR, "enable_bt_sink", STR(CONFIG_BT_SINK), 0);
ESP_LOGD(TAG,"Registering default value for key %s, value %s", "bt_sink_pin", STR(CONFIG_BT_SINK_PIN));
config_set_default(NVS_TYPE_STR, "bt_sink_pin", STR(CONFIG_BT_SINK_PIN), 0);
ESP_LOGD(TAG,"Registering default value for key %s, value %s", "bt_sink_volume", "127");
config_set_default(NVS_TYPE_STR, "bt_sink_volume", "127", 0);
#endif
#if CONFIG_AIRPLAY_SINK
DEFAULT_NAME_WITH_MAC(default_airplay_name,CONFIG_AIRPLAY_NAME); DEFAULT_NAME_WITH_MAC(default_airplay_name,CONFIG_AIRPLAY_NAME);
ESP_LOGD(TAG,"Registering default value for key %s, value %s", "airplay_name",default_airplay_name); ESP_LOGD(TAG,"Registering default value for key %s, value %s", "airplay_name",default_airplay_name);
config_set_default(NVS_TYPE_STR, "airplay_name",default_airplay_name , 0); config_set_default(NVS_TYPE_STR, "airplay_name",default_airplay_name , 0);
ESP_LOGD(TAG,"Registering default value for key %s, value %s", "airplay_port", CONFIG_AIRPLAY_PORT);
config_set_default(NVS_TYPE_STR, "airplay_port", CONFIG_AIRPLAY_PORT, 0);
ESP_LOGD(TAG,"Registering default value for key %s, value %s", "enable_airplay", STR(CONFIG_AIRPLAY_SINK));
config_set_default(NVS_TYPE_STR, "enable_airplay", STR(CONFIG_AIRPLAY_SINK), 0);
#endif
DEFAULT_NAME_WITH_MAC(default_ap_name,CONFIG_DEFAULT_AP_SSID); DEFAULT_NAME_WITH_MAC(default_ap_name,CONFIG_DEFAULT_AP_SSID);
ESP_LOGD(TAG,"Registering default value for key %s, value %s", "ap_ssid", default_ap_name); ESP_LOGD(TAG,"Registering default value for key %s, value %s", "ap_ssid", default_ap_name);
config_set_default(NVS_TYPE_STR, "ap_ssid",default_ap_name , 0); config_set_default(NVS_TYPE_STR, "ap_ssid",default_ap_name , 0);
@@ -317,9 +336,6 @@ void register_default_nvs(){
ESP_LOGD(TAG,"Registering default value for key %s, value %s", "ap_pwd", CONFIG_DEFAULT_AP_PASSWORD); ESP_LOGD(TAG,"Registering default value for key %s, value %s", "ap_pwd", CONFIG_DEFAULT_AP_PASSWORD);
config_set_default(NVS_TYPE_STR, "ap_pwd", CONFIG_DEFAULT_AP_PASSWORD, 0); config_set_default(NVS_TYPE_STR, "ap_pwd", CONFIG_DEFAULT_AP_PASSWORD, 0);
ESP_LOGD(TAG,"Registering default value for key %s, value %s", "airplay_port", CONFIG_AIRPLAY_PORT);
config_set_default(NVS_TYPE_STR, "airplay_port", CONFIG_AIRPLAY_PORT, 0);
ESP_LOGD(TAG,"Registering default value for key %s, value %s", "a2dp_dev_name", CONFIG_A2DP_DEV_NAME); ESP_LOGD(TAG,"Registering default value for key %s, value %s", "a2dp_dev_name", CONFIG_A2DP_DEV_NAME);
config_set_default(NVS_TYPE_STR, "a2dp_dev_name", CONFIG_A2DP_DEV_NAME, 0); config_set_default(NVS_TYPE_STR, "a2dp_dev_name", CONFIG_A2DP_DEV_NAME, 0);
@@ -351,18 +367,6 @@ void register_default_nvs(){
ESP_LOGD(TAG,"Registering default value for key %s, value %s", "ota_prio", number_buffer); ESP_LOGD(TAG,"Registering default value for key %s, value %s", "ota_prio", number_buffer);
config_set_default(NVS_TYPE_STR, "ota_prio", number_buffer, 0); config_set_default(NVS_TYPE_STR, "ota_prio", number_buffer, 0);
ESP_LOGD(TAG,"Registering default value for key %s, value %s", "enable_bt_sink", STR(CONFIG_BT_SINK));
config_set_default(NVS_TYPE_STR, "enable_bt_sink", STR(CONFIG_BT_SINK), 0);
ESP_LOGD(TAG,"Registering default value for key %s, value %s", "bt_sink_pin", STR(CONFIG_BT_SINK_PIN));
config_set_default(NVS_TYPE_STR, "bt_sink_pin", STR(CONFIG_BT_SINK_PIN), 0);
ESP_LOGD(TAG,"Registering default value for key %s, value %s", "bt_sink_volume", "127");
config_set_default(NVS_TYPE_STR, "bt_sink_volume", "127", 0);
ESP_LOGD(TAG,"Registering default value for key %s, value %s", "enable_airplay", STR(CONFIG_AIRPLAY_SINK));
config_set_default(NVS_TYPE_STR, "enable_airplay", STR(CONFIG_AIRPLAY_SINK), 0);
ESP_LOGD(TAG,"Registering default value for key %s, value %s", "display_config", CONFIG_DISPLAY_CONFIG); ESP_LOGD(TAG,"Registering default value for key %s, value %s", "display_config", CONFIG_DISPLAY_CONFIG);
config_set_default(NVS_TYPE_STR, "display_config", CONFIG_DISPLAY_CONFIG, 0); config_set_default(NVS_TYPE_STR, "display_config", CONFIG_DISPLAY_CONFIG, 0);
@@ -425,8 +429,10 @@ void handle_ap_connect(){
start_telnet(NULL); start_telnet(NULL);
halSTORAGE_RebootCounterUpdate(0); halSTORAGE_RebootCounterUpdate(0);
} }
void app_main() void app_main()
{ {
ESP_LOGW(TAG, "Heap internal:%zu/%zu", heap_caps_get_free_size(MALLOC_CAP_INTERNAL), heap_caps_get_total_size(MALLOC_CAP_INTERNAL));
const esp_partition_t *running = esp_ota_get_running_partition(); const esp_partition_t *running = esp_ota_get_running_partition();
is_recovery_running = (running->subtype == ESP_PARTITION_SUBTYPE_APP_FACTORY); is_recovery_running = (running->subtype == ESP_PARTITION_SUBTYPE_APP_FACTORY);
esp_reset_reason_t xReason = esp_reset_reason(); esp_reset_reason_t xReason = esp_reset_reason();