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

fix spdif+spotify stuttering and refactor stats => add pseudo_idle chained callbacks

Browse Source
This commit is contained in:
philippe44
2023-09-03 17:34:45 -07:00
parent 45cae64c83
commit 0b077b5234
4 changed files with 138 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
components/services/monitor.c
View File

@@ -14,6 +14,7 @@
#include "freertos/timers.h" #include "freertos/timers.h"
#include "esp_system.h" #include "esp_system.h"
#include "esp_log.h" #include "esp_log.h"
#include "esp_task.h"
#include "monitor.h" #include "monitor.h"
#include "driver/gpio.h" #include "driver/gpio.h"
#include "buttons.h" #include "buttons.h"
@@ -25,15 +26,14 @@
#include "cJSON.h" #include "cJSON.h"
#include "tools.h" #include "tools.h"
#define PSEUDO_IDLE_STACK_SIZE (3*1024)
#define MONITOR_TIMER (10*1000) #define MONITOR_TIMER (10*1000)
#define SCRATCH_SIZE 256 #define SCRATCH_SIZE 256
static const char *TAG = "monitor"; static const char *TAG = "monitor";
static TimerHandle_t monitor_timer; void (*pseudo_idle_svc)(uint32_t now);
static monitor_gpio_t jack = { CONFIG_JACK_GPIO, 0 };
static monitor_gpio_t spkfault = { CONFIG_SPKFAULT_GPIO, 0 };
void (*jack_handler_svc)(bool inserted); void (*jack_handler_svc)(bool inserted);
bool jack_inserted_svc(void); bool jack_inserted_svc(void);
@@ -41,6 +41,9 @@ bool jack_inserted_svc(void);
void (*spkfault_handler_svc)(bool inserted); void (*spkfault_handler_svc)(bool inserted);
bool spkfault_svc(void); bool spkfault_svc(void);
static monitor_gpio_t jack = { CONFIG_JACK_GPIO, 0 };
static monitor_gpio_t spkfault = { CONFIG_SPKFAULT_GPIO, 0 };
static bool monitor_stats;
/**************************************************************************************** /****************************************************************************************
* *
@@ -52,14 +55,14 @@ static void task_stats( cJSON* top ) {
TaskStatus_t *tasks; TaskStatus_t *tasks;
uint32_t total, n; uint32_t total, n;
} current, previous; } current, previous;
cJSON * tlist=cJSON_CreateArray(); cJSON * tlist=cJSON_CreateArray();
current.n = uxTaskGetNumberOfTasks(); current.n = uxTaskGetNumberOfTasks();
current.tasks = malloc_init_external( current.n * sizeof( TaskStatus_t ) ); current.tasks = malloc_init_external( current.n * sizeof( TaskStatus_t ) );
current.n = uxTaskGetSystemState( current.tasks, current.n, &current.total ); current.n = uxTaskGetSystemState( current.tasks, current.n, &current.total );
cJSON_AddNumberToObject(top,"ntasks",current.n); cJSON_AddNumberToObject(top,"ntasks",current.n);
static EXT_RAM_ATTR char scratch[SCRATCH_SIZE]; char scratch[SCRATCH_SIZE] = { 0 };
*scratch = '\0';
#ifdef CONFIG_FREERTOS_GENERATE_RUN_TIME_STATS #ifdef CONFIG_FREERTOS_GENERATE_RUN_TIME_STATS
#pragma message("Compiled with runtime stats") #pragma message("Compiled with runtime stats")
@@ -119,7 +122,12 @@ static void task_stats( cJSON* top ) {
/**************************************************************************************** /****************************************************************************************
* *
*/ */
static void monitor_callback(TimerHandle_t xTimer) { static void monitor_trace(uint32_t now) {
static uint32_t last;
if (now < last + MONITOR_TIMER) return;
last = now;
cJSON * top=cJSON_CreateObject(); cJSON * top=cJSON_CreateObject();
cJSON_AddNumberToObject(top,"free_iram",heap_caps_get_free_size(MALLOC_CAP_INTERNAL)); cJSON_AddNumberToObject(top,"free_iram",heap_caps_get_free_size(MALLOC_CAP_INTERNAL));
cJSON_AddNumberToObject(top,"min_free_iram",heap_caps_get_minimum_free_size(MALLOC_CAP_INTERNAL)); cJSON_AddNumberToObject(top,"min_free_iram",heap_caps_get_minimum_free_size(MALLOC_CAP_INTERNAL));
@@ -208,6 +216,19 @@ static void set_spkfault_gpio(int gpio, char *value) {
} }
#endif #endif
/****************************************************************************************
*
*/
static void pseudo_idle(void *arg) {
while (1) {
vTaskDelay(pdMS_TO_TICKS(1000));
uint32_t now = pdTICKS_TO_MS(xTaskGetTickCount());
if (monitor_stats) monitor_trace(now);
if (pseudo_idle_svc) pseudo_idle_svc(now);
}
}
/**************************************************************************************** /****************************************************************************************
* *
*/ */
@@ -244,10 +265,7 @@ void monitor_svc_init(void) {
// do we want stats // do we want stats
char *p = config_alloc_get_default(NVS_TYPE_STR, "stats", "n", 0); char *p = config_alloc_get_default(NVS_TYPE_STR, "stats", "n", 0);
if (p && (*p == '1' || *p == 'Y' || *p == 'y')) { monitor_stats = p && (*p == '1' || *p == 'Y' || *p == 'y');
monitor_timer = xTimerCreate("monitor", MONITOR_TIMER / portTICK_RATE_MS, pdTRUE, NULL, monitor_callback);
xTimerStart(monitor_timer, portMAX_DELAY);
}
FREE_AND_NULL(p); FREE_AND_NULL(p);
ESP_LOGI(TAG, "Heap internal:%zu (min:%zu) external:%zu (min:%zu) dma:%zu (min:%zu)", ESP_LOGI(TAG, "Heap internal:%zu (min:%zu) external:%zu (min:%zu) dma:%zu (min:%zu)",
@@ -257,6 +275,12 @@ void monitor_svc_init(void) {
heap_caps_get_minimum_free_size(MALLOC_CAP_SPIRAM), heap_caps_get_minimum_free_size(MALLOC_CAP_SPIRAM),
heap_caps_get_free_size(MALLOC_CAP_DMA), heap_caps_get_free_size(MALLOC_CAP_DMA),
heap_caps_get_minimum_free_size(MALLOC_CAP_DMA)); heap_caps_get_minimum_free_size(MALLOC_CAP_DMA));
// pseudo-idle callback => don't use FreeRTOS idle callbacks so we can block (should not but ...)
StaticTask_t* xTaskBuffer = (StaticTask_t*) heap_caps_malloc(sizeof(StaticTask_t), MALLOC_CAP_INTERNAL | MALLOC_CAP_8BIT);
static EXT_RAM_ATTR StackType_t xStack[PSEUDO_IDLE_STACK_SIZE] __attribute__ ((aligned (4)));
xTaskCreateStatic( (TaskFunction_t) pseudo_idle, "pseudo_idle", PSEUDO_IDLE_STACK_SIZE,
NULL, ESP_TASK_PRIO_MIN, xStack, xTaskBuffer );
} }
/**************************************************************************************** /****************************************************************************************

2
components/services/monitor.h
View File

@@ -14,6 +14,8 @@ typedef struct {
int active; int active;
} monitor_gpio_t; } monitor_gpio_t;
extern void (*pseudo_idle_svc)(uint32_t now);
extern void (*jack_handler_svc)(bool inserted); extern void (*jack_handler_svc)(bool inserted);
extern bool jack_inserted_svc(void); extern bool jack_inserted_svc(void);

22
components/squeezelite/equalizer.c
View File

@@ -129,7 +129,9 @@ void equalizer_set_volume(unsigned left, unsigned right) {
// do classic dB conversion and scale it 0..100 // do classic dB conversion and scale it 0..100
if (volume) volume = log2(volume); if (volume) volume = log2(volume);
volume = volume / 16.0 * 100.0; volume = volume / 16.0 * 100.0;
if (volume != equalizer.volume) {
// LMS has the bad habit to send multiple volume commands
if (volume != equalizer.volume && equalizer.loudness) {
equalizer.volume = volume; equalizer.volume = volume;
calculate_loudness(); calculate_loudness();
equalizer.update = true; equalizer.update = true;
@@ -145,14 +147,16 @@ void equalizer_set_gain(int8_t *gain) {
char config[EQ_BANDS * 4 + 1] = { }; char config[EQ_BANDS * 4 + 1] = { };
int n = 0; int n = 0;
for (int i = 0; i < EQ_BANDS; i++) { for (int i = 0; i < EQ_BANDS; i++) {
equalizer.gain[i] = gain[i]; equalizer.gain[i] = gain[i];
n += sprintf(config + n, "%d,", gain[i]); n += sprintf(config + n, "%d,", gain[i]);
} }
config[n-1] = '\0'; config[n-1] = '\0';
config_set_value(NVS_TYPE_STR, "equalizer", config); config_set_value(NVS_TYPE_STR, "equalizer", config);
equalizer.update = true;
// update only if something changed
if (!memcmp(equalizer.gain, gain, EQ_BANDS)) equalizer.update = true;
LOG_INFO("equalizer gain %s", config); LOG_INFO("equalizer gain %s", config);
#else #else
@@ -165,14 +169,16 @@ void equalizer_set_gain(int8_t *gain) {
*/ */
void equalizer_set_loudness(uint8_t loudness) { void equalizer_set_loudness(uint8_t loudness) {
#if BYTES_PER_FRAME == 4 #if BYTES_PER_FRAME == 4
// update loudness gains as a factor of loudness and volume
equalizer.loudness = loudness / 10.0;
calculate_loudness();
char p[4]; char p[4];
itoa(loudness, p, 10); itoa(loudness, p, 10);
config_set_value(NVS_TYPE_STR, "loudness", p); config_set_value(NVS_TYPE_STR, "loudness", p);
equalizer.update = true;
// update loudness gains as a factor of loudness and volume
if (equalizer.loudness != loudness / 10.0) {
equalizer.loudness = loudness / 10.0;
calculate_loudness();
equalizer.update = true;
}
LOG_INFO("loudness %u", (unsigned) loudness); LOG_INFO("loudness %u", (unsigned) loudness);
#else #else

86
components/squeezelite/output_i2s.c
View File

@@ -55,8 +55,10 @@ sure that using rate_delay would fix that
#define SPDIF_BLOCK 256 #define SPDIF_BLOCK 256
// must have an integer ratio with FRAME_BLOCK (see spdif comment) // must have an integer ratio with FRAME_BLOCK (see spdif comment)
#define DMA_BUF_LEN 512 #define DMA_SIZE 6144
#define DMA_BUF_COUNT 12 // FRAME_BLOCK must be a multiple of DMA_BUF_LEN no matter what
#define DMA_BUF_LEN FRAME_BLOCK
#define DMA_BUF_COUNT (DMA_SIZE / DMA_BUF_LEN)
#define DECLARE_ALL_MIN_MAX \ #define DECLARE_ALL_MIN_MAX \
DECLARE_MIN_MAX(o); \ DECLARE_MIN_MAX(o); \
@@ -73,7 +75,7 @@ sure that using rate_delay would fix that
RESET_MIN_MAX(buffering); RESET_MIN_MAX(buffering);
#define STATS_PERIOD_MS 5000 #define STATS_PERIOD_MS 5000
#define STAT_STACK_SIZE (3*1024) static void (*pseudo_idle_chain)(uint32_t now);
#ifndef CONFIG_AMP_GPIO_LEVEL #ifndef CONFIG_AMP_GPIO_LEVEL
#define CONFIG_AMP_GPIO_LEVEL 1 #define CONFIG_AMP_GPIO_LEVEL 1
@@ -101,8 +103,7 @@ static struct {
size_t count; size_t count;
} spdif; } spdif;
static size_t dma_buf_frames; static size_t dma_buf_frames;
static TaskHandle_t stats_task, output_i2s_task; static TaskHandle_t output_i2s_task;
static bool stats;
static struct { static struct {
int gpio, active; int gpio, active;
} amp_control = { CONFIG_AMP_GPIO, CONFIG_AMP_GPIO_LEVEL }, } amp_control = { CONFIG_AMP_GPIO, CONFIG_AMP_GPIO_LEVEL },
@@ -113,7 +114,7 @@ DECLARE_ALL_MIN_MAX;
static int _i2s_write_frames(frames_t out_frames, bool silence, s32_t gainL, s32_t gainR, u8_t flags, static int _i2s_write_frames(frames_t out_frames, bool silence, s32_t gainL, s32_t gainR, u8_t flags,
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);
static void output_thread_i2s(void *arg); static void output_thread_i2s(void *arg);
static void output_thread_i2s_stats(void *arg); static void i2s_stats(uint32_t now);
static void spdif_convert(ISAMPLE_T *src, size_t frames, u32_t *dst, size_t *count); static void spdif_convert(ISAMPLE_T *src, size_t frames, u32_t *dst, size_t *count);
static void (*jack_handler_chain)(bool inserted); static void (*jack_handler_chain)(bool inserted);
@@ -251,8 +252,6 @@ void output_init_i2s(log_level level, char *device, unsigned output_buf_size, ch
return; return;
} }
/* BEWARE: i2s.c must be patched otherwise L/R are swapped in 32 bits mode */
// common I2S initialization // common I2S initialization
i2s_config.mode = I2S_MODE_MASTER | I2S_MODE_TX; i2s_config.mode = I2S_MODE_MASTER | I2S_MODE_TX;
i2s_config.channel_format = I2S_CHANNEL_FMT_RIGHT_LEFT; i2s_config.channel_format = I2S_CHANNEL_FMT_RIGHT_LEFT;
@@ -410,17 +409,11 @@ void output_init_i2s(log_level level, char *device, unsigned output_buf_size, ch
// do we want stats // do we want stats
p = config_alloc_get_default(NVS_TYPE_STR, "stats", "n", 0); p = config_alloc_get_default(NVS_TYPE_STR, "stats", "n", 0);
stats = p && (*p == '1' || *p == 'Y' || *p == 'y'); if (p && (*p == '1' || *p == 'Y' || *p == 'y')) {
free(p); pseudo_idle_chain = pseudo_idle_svc;
pseudo_idle_svc = i2s_stats;
// memory still used but at least task is not created
if (stats) {
// we allocate TCB but stack is static to avoid SPIRAM fragmentation
StaticTask_t* xTaskBuffer = (StaticTask_t*) heap_caps_malloc(sizeof(StaticTask_t), MALLOC_CAP_INTERNAL | MALLOC_CAP_8BIT);
static EXT_RAM_ATTR StackType_t xStack[STAT_STACK_SIZE] __attribute__ ((aligned (4)));
stats_task = xTaskCreateStatic( (TaskFunction_t) output_thread_i2s_stats, "output_i2s_sts", STAT_STACK_SIZE,
NULL, ESP_TASK_PRIO_MIN, xStack, xTaskBuffer);
} }
free(p);
} }
@@ -433,7 +426,6 @@ void output_close_i2s(void) {
UNLOCK; UNLOCK;
while (!ended) vTaskDelay(20 / portTICK_PERIOD_MS); while (!ended) vTaskDelay(20 / portTICK_PERIOD_MS);
if (stats) vTaskDelete(stats_task);
i2s_driver_uninstall(CONFIG_I2S_NUM); i2s_driver_uninstall(CONFIG_I2S_NUM);
free(obuf); free(obuf);
@@ -538,6 +530,9 @@ static void output_thread_i2s(void *arg) {
// oframes must be a global updated by the write callback // oframes must be a global updated by the write callback
output.frames_in_process = oframes; output.frames_in_process = oframes;
// force some sin
//memcpy(obuf, __obuf, oframes*BYTES_PER_FRAME);
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);
SET_MIN_MAX_SIZED(_buf_used(streambuf),s,streambuf->size); SET_MIN_MAX_SIZED(_buf_used(streambuf),s,streambuf->size);
@@ -628,33 +623,34 @@ static void output_thread_i2s(void *arg) {
/**************************************************************************************** /****************************************************************************************
* Stats output thread * Stats output thread
*/ */
static void output_thread_i2s_stats(void *arg) { static void i2s_stats(uint32_t now) {
while (1) { static uint32_t last;
// no need to lock
output_state state = output.state;
if(stats && state>OUTPUT_STOPPED){ // first chain to next handler
LOG_INFO( "Output State: %d, current sample rate: %d, bytes per frame: %d",state,output.current_sample_rate, BYTES_PER_FRAME); if (pseudo_idle_chain) pseudo_idle_chain(now);
LOG_INFO( LINE_MIN_MAX_FORMAT_HEAD1);
LOG_INFO( LINE_MIN_MAX_FORMAT_HEAD2); // then see if we need to act
LOG_INFO( LINE_MIN_MAX_FORMAT_HEAD3); if (output.state <= OUTPUT_STOPPED || now < last + STATS_PERIOD_MS) return;
LOG_INFO( LINE_MIN_MAX_FORMAT_HEAD4); last = now;
LOG_INFO(LINE_MIN_MAX_FORMAT_STREAM, LINE_MIN_MAX_STREAM("stream",s));
LOG_INFO(LINE_MIN_MAX_FORMAT,LINE_MIN_MAX("output",o)); LOG_INFO( "Output State: %d, current sample rate: %d, bytes per frame: %d", output.state, output.current_sample_rate, BYTES_PER_FRAME);
LOG_INFO(LINE_MIN_MAX_FORMAT_FOOTER); LOG_INFO( LINE_MIN_MAX_FORMAT_HEAD1);
LOG_INFO(LINE_MIN_MAX_FORMAT,LINE_MIN_MAX("received",rec)); LOG_INFO( LINE_MIN_MAX_FORMAT_HEAD2);
LOG_INFO(LINE_MIN_MAX_FORMAT_FOOTER); LOG_INFO( LINE_MIN_MAX_FORMAT_HEAD3);
LOG_INFO(""); LOG_INFO( LINE_MIN_MAX_FORMAT_HEAD4);
LOG_INFO(" ----------+----------+-----------+-----------+ "); LOG_INFO(LINE_MIN_MAX_FORMAT_STREAM, LINE_MIN_MAX_STREAM("stream",s));
LOG_INFO(" max (us) | min (us) | avg(us) | count | "); LOG_INFO(LINE_MIN_MAX_FORMAT,LINE_MIN_MAX("output",o));
LOG_INFO(" ----------+----------+-----------+-----------+ "); LOG_INFO(LINE_MIN_MAX_FORMAT_FOOTER);
LOG_INFO(LINE_MIN_MAX_DURATION_FORMAT,LINE_MIN_MAX_DURATION("Buffering(us)",buffering)); LOG_INFO(LINE_MIN_MAX_FORMAT,LINE_MIN_MAX("received",rec));
LOG_INFO(LINE_MIN_MAX_DURATION_FORMAT,LINE_MIN_MAX_DURATION("i2s tfr(us)",i2s_time)); LOG_INFO(LINE_MIN_MAX_FORMAT_FOOTER);
LOG_INFO(" ----------+----------+-----------+-----------+"); LOG_INFO("");
RESET_ALL_MIN_MAX; LOG_INFO(" ----------+----------+-----------+-----------+ ");
} LOG_INFO(" max (us) | min (us) | avg(us) | count | ");
vTaskDelay( pdMS_TO_TICKS( STATS_PERIOD_MS ) ); LOG_INFO(" ----------+----------+-----------+-----------+ ");
} LOG_INFO(LINE_MIN_MAX_DURATION_FORMAT,LINE_MIN_MAX_DURATION("Buffering(us)",buffering));
LOG_INFO(LINE_MIN_MAX_DURATION_FORMAT,LINE_MIN_MAX_DURATION("i2s tfr(us)",i2s_time));
LOG_INFO(" ----------+----------+-----------+-----------+");
RESET_ALL_MIN_MAX;
} }
/**************************************************************************************** /****************************************************************************************