From d063457616a73a40b28d76187a625995f5c6112d Mon Sep 17 00:00:00 2001 From: philippe44 Date: Wed, 21 Aug 2019 17:14:03 -0700 Subject: [PATCH] tweaks --- components/squeezelite/decode.c | 2 +- components/squeezelite/decode_external.c | 2 +- components/squeezelite/embedded.h | 2 +- components/squeezelite/output_i2s.c | 8 +++++--- sdkconfig.defaults | 4 ++-- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/components/squeezelite/decode.c b/components/squeezelite/decode.c index 333af5df..5ef09c43 100644 --- a/components/squeezelite/decode.c +++ b/components/squeezelite/decode.c @@ -200,7 +200,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()); #if EMBEDDED - register_other(); + register_external(); #endif LOG_DEBUG("include codecs: %s exclude codecs: %s", include_codecs ? include_codecs : "", exclude_codecs); diff --git a/components/squeezelite/decode_external.c b/components/squeezelite/decode_external.c index 267dbf2c..5d5a52c6 100644 --- a/components/squeezelite/decode_external.c +++ b/components/squeezelite/decode_external.c @@ -267,7 +267,7 @@ void raop_sink_cmd_handler(raop_event_t event, void *param) /**************************************************************************************** * We provide the generic codec register option */ -void register_other(void) { +void register_external(void) { #ifdef CONFIG_BT_SINK if (!strcasestr(output.device, "BT ")) { bt_sink_init(bt_sink_cmd_handler, sink_data_handler); diff --git a/components/squeezelite/embedded.h b/components/squeezelite/embedded.h index 21a37d1e..41eef2c0 100644 --- a/components/squeezelite/embedded.h +++ b/components/squeezelite/embedded.h @@ -39,6 +39,6 @@ typedef unsigned long long u64_t; uint32_t _gettime_ms_(void); int pthread_create_name(pthread_t *thread, _CONST pthread_attr_t *attr, void *(*start_routine)( void * ), void *arg, char *name); -void register_other(void); +void register_external(void); #endif // EMBEDDED_H diff --git a/components/squeezelite/output_i2s.c b/components/squeezelite/output_i2s.c index 428e81a6..e3b85867 100644 --- a/components/squeezelite/output_i2s.c +++ b/components/squeezelite/output_i2s.c @@ -308,10 +308,12 @@ void output_init_i2s(log_level level, char *device, unsigned output_buf_size, ch 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 + + pthread_attr_init(&attr); + pthread_attr_setstacksize(&attr, 2048); pthread_create_name(&stats_thread, NULL, output_thread_i2s_stats, NULL, "output_i2s_sts"); + + pthread_attr_destroy(&attr); } diff --git a/sdkconfig.defaults b/sdkconfig.defaults index dfd3ccdc..d228344c 100644 --- a/sdkconfig.defaults +++ b/sdkconfig.defaults @@ -77,8 +77,8 @@ CONFIG_SPIRAM_SIZE=-1 CONFIG_SPIRAM_SPEED_80M=y CONFIG_SPIRAM_MEMTEST=y CONFIG_SPIRAM_CACHE_WORKAROUND=y -CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=512 -CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=32768 +CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=256 +CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=65536 CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY=y CONFIG_SPIRAM_OCCUPY_VSPI_HOST=y CONFIG_SPIRAM_BANKSWITCH_ENABLE=n