hexianglong/snapclient
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add new synchronization implementation

Browse Source 
use sample stuffing / removal to keep up sync

Signed-off-by: Karl Osterseher <karli_o@gmx.at>
This commit is contained in:
Karl Osterseher
2024-02-02 18:05:05 +01:00
Unverified
parent bd17be1b7f
commit 1e3bda9ad0
5 changed files with 119 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

201
components/lightsnapcast/player.c
View File

@@ -32,7 +32,7 @@
#include "driver/i2s_std.h" #include "driver/i2s_std.h"
#define USE_SAMPLE_INSERTION 0 // TODO: doesn't work as intended #define USE_SAMPLE_INSERTION CONFIG_USE_SAMPLE_INSERTION
#define SYNC_TASK_PRIORITY (configMAX_PRIORITIES - 1) #define SYNC_TASK_PRIORITY (configMAX_PRIORITIES - 1)
#define SYNC_TASK_CORE_ID 1 // tskNO_AFFINITY #define SYNC_TASK_CORE_ID 1 // tskNO_AFFINITY
@@ -105,10 +105,16 @@ static i2s_chan_handle_t tx_chan = NULL; // I2S tx channel handler
*/ */
static esp_err_t player_setup_i2s(i2s_port_t i2sNum, static esp_err_t player_setup_i2s(i2s_port_t i2sNum,
snapcastSetting_t *setting) { snapcastSetting_t *setting) {
int fi2s_clk;
#if USE_SAMPLE_INSERTION
i2sDmaBufMaxLen = 6;
i2sDmaBufCnt = CHNK_CTRL_CNT * (setting->chkInFrames /
i2sDmaBufMaxLen); // 288 * CHNK_CTRL_CNT;
#else
const int __dmaBufMaxLen = 1024;
int __dmaBufCnt; int __dmaBufCnt;
int __dmaBufLen; int __dmaBufLen;
const int __dmaBufMaxLen = 1024;
int m_scale = 8, fi2s_clk;
__dmaBufCnt = 1; __dmaBufCnt = 1;
__dmaBufLen = setting->chkInFrames; __dmaBufLen = setting->chkInFrames;
@@ -126,10 +132,6 @@ static esp_err_t player_setup_i2s(i2s_port_t i2sNum,
i2sDmaBufCnt = __dmaBufCnt * CHNK_CTRL_CNT; i2sDmaBufCnt = __dmaBufCnt * CHNK_CTRL_CNT;
i2sDmaBufMaxLen = __dmaBufLen; i2sDmaBufMaxLen = __dmaBufLen;
#if USE_SAMPLE_INSERTION
i2sDmaBufCnt = 128;
i2sDmaBufMaxLen = 9;
#endif #endif
// check i2s_set_get_apll_freq() how it is done // check i2s_set_get_apll_freq() how it is done
@@ -1600,10 +1602,12 @@ static void player_task(void *pvParameters) {
#if USE_SAMPLE_INSERTION // WIP: insert samples to adjust sync #if USE_SAMPLE_INSERTION // WIP: insert samples to adjust sync
if ((enableControlLoop == true) && if ((enableControlLoop == true) &&
(MEDIANFILTER_isFull(&shortMedianFilter, 0))) { (MEDIANFILTER_isFull(&shortMedianFilter, 0))) {
if (avg < -miniOffset) { // we are early if ((shortMedian < -shortOffset) && (miniMedian < -miniOffset) &&
(avg < -miniOffset)) { // we are early
dir = -1; dir = -1;
dir_insert_sample = -1; dir_insert_sample = -1;
} else if (avg > miniOffset) { // we are late } else if ((shortMedian > shortOffset) && (miniMedian > miniOffset) &&
(avg > miniOffset)) { // we are late
dir = 1; dir = 1;
dir_insert_sample = 1; dir_insert_sample = 1;
} }
@@ -1640,11 +1644,11 @@ static void player_task(void *pvParameters) {
// ESP_LOGI (TAG, "%d, %lldus, q %d", dir, avg, // ESP_LOGI (TAG, "%d, %lldus, q %d", dir, avg,
// uxQueueMessagesWaiting(pcmChkQHdl)); // uxQueueMessagesWaiting(pcmChkQHdl));
// ESP_LOGI (TAG, "%d, %lldus, %lldus %llds, // ESP_LOGI (TAG, "%d, %lldus, %lldus %llds,
// %lld.%lldms", dir, age, avg, sec, msec, usec); //%lld.%lldms", dir, age, avg, sec, msec, usec);
// ESP_LOGI(TAG, "%d, %lldus, %lldus, %lldus, q:%d", dir, // ESP_LOGI(TAG, "%d, %lldus, %lldus, %lldus, q:%d", dir, avg,
// avg, shortMedian, miniMedian, // shortMedian, miniMedian,
// uxQueueMessagesWaiting(pcmChkQHdl)); // uxQueueMessagesWaiting(pcmChkQHdl));
// ESP_LOGI( TAG, "8b f // ESP_LOGI( TAG, "8b f
@@ -1670,107 +1674,98 @@ static void player_task(void *pvParameters) {
written = 0; written = 0;
#if USE_SAMPLE_INSERTION #if USE_SAMPLE_INSERTION
uint32_t sampleSizeInBytes = 4 * 3; // uint32_t sampleSizeInBytes = (uint32_t)(scSet.bits / 8) *
// scSet.ch * (uint32_t)(miniMedian / (1E6 / scSet.sr));
uint32_t sampleSizeInBytes = (scSet.bits / 8) * scSet.ch * 1;
if (dir_insert_sample == -1) { if (dir_insert_sample == -1) {
if (i2s_channel_write(tx_chan, p_payload, sampleSizeInBytes, if (i2s_channel_write(tx_chan, p_payload, sampleSizeInBytes,
&written, portMAX_DELAY) != ESP_OK) &written, portMAX_DELAY) != ESP_OK) {
// if (i2s_write(I2S_NUM_0, p_payload,
// (size_t)sampleSizeInBytes,
// &written, portMAX_DELAY) !=
// ESP_OK) {
ESP_LOGE(TAG, "i2s_playback_task: I2S write error %d", 1); ESP_LOGE(TAG, "i2s_playback_task: I2S write error %d", 1);
}
} else if (dir_insert_sample == 1) {
size -= sampleSizeInBytes;
} }
}
else if (dir_insert_sample == 1) {
size -= sampleSizeInBytes;
}
dir_insert_sample = 0; dir_insert_sample = 0;
#endif #endif
if (i2s_channel_write(tx_chan, p_payload, size, &written, if (i2s_channel_write(tx_chan, p_payload, size, &written,
portMAX_DELAY) != ESP_OK) { portMAX_DELAY) != ESP_OK) {
// if (i2s_write(I2S_NUM_0, p_payload, (size_t)size, ESP_LOGE(TAG, "i2s_playback_task: I2S write error %d", size);
// &written,
// portMAX_DELAY) != ESP_OK) {
ESP_LOGE(TAG, "i2s_playback_task: I2S write error %d", size);
}
if (written < size) {
ESP_LOGE(TAG, "i2s_playback_task: I2S didn't write all data");
}
size -= written;
p_payload += written;
if (size == 0) {
if (fragment->nextFragment != NULL) {
fragment = fragment->nextFragment;
p_payload = fragment->payload;
size = fragment->size;
// ESP_LOGI (TAG, "%s: fragmented", __func__);
} else {
free_pcm_chunk(chnk);
chnk = NULL;
break;
} }
}
if (written < size) {
ESP_LOGE(TAG, "i2s_playback_task: I2S didn't write all data");
}
size -= written;
p_payload += written;
if (size == 0) {
if (fragment->nextFragment != NULL) {
fragment = fragment->nextFragment;
p_payload = fragment->payload;
size = fragment->size;
// ESP_LOGI (TAG, "%s: fragmented", __func__);
} else {
free_pcm_chunk(chnk);
chnk = NULL;
break;
}
}
} while (1);
} else {
// here we have an empty fragment because of memory allocation error.
// fill DMA with zeros so we don't get out of sync
written = 0;
const size_t write_size = 4;
uint8_t tmpBuf[write_size];
memset(tmpBuf, 0, sizeof(tmpBuf));
do {
if (i2s_channel_write(tx_chan, tmpBuf, write_size, &written,
portMAX_DELAY) != ESP_OK) {
// if (i2s_write(I2S_NUM_0, tmpBuf, (size_t)write_size,
// &written, portMAX_DELAY) !=
// ESP_OK) {
ESP_LOGE(TAG, "i2s_playback_task: I2S write error %d", size);
}
size -= written;
} while (size);
free_pcm_chunk(chnk);
chnk = NULL;
} }
while (1)
;
} else {
// here we have an empty fragment because of memory allocation error.
// fill DMA with zeros so we don't get out of sync
written = 0;
const size_t write_size = 4;
uint8_t tmpBuf[write_size];
memset(tmpBuf, 0, sizeof(tmpBuf));
do {
if (i2s_channel_write(tx_chan, tmpBuf, write_size, &written,
portMAX_DELAY) != ESP_OK) {
// if (i2s_write(I2S_NUM_0, tmpBuf, (size_t)write_size,
// &written, portMAX_DELAY) !=
// ESP_OK) {
ESP_LOGE(TAG, "i2s_playback_task: I2S write error %d", size);
}
size -= written;
} while (size);
free_pcm_chunk(chnk);
chnk = NULL;
} }
} else {
int64_t sec, msec, usec;
sec = diff2Server / 1000000;
usec = diff2Server - sec * 1000000;
msec = usec / 1000;
usec = usec % 1000;
// xSemaphoreTake(playerPcmQueueMux, portMAX_DELAY);
if (pcmChkQHdl != NULL) {
ESP_LOGE(TAG,
"Couldn't get PCM chunk, recv: messages waiting %d, "
"diff2Server: %llds, %lld.%lldms",
uxQueueMessagesWaiting(pcmChkQHdl), sec, msec, usec);
}
// xSemaphoreGive(playerPcmQueueMux);
dir = 0;
initialSync = 0;
audio_set_mute(true);
// i2s_stop(I2S_NUM_0);
i2s_channel_disable(tx_chan);
} }
} }
else {
int64_t sec, msec, usec;
sec = diff2Server / 1000000;
usec = diff2Server - sec * 1000000;
msec = usec / 1000;
usec = usec % 1000;
// xSemaphoreTake(playerPcmQueueMux, portMAX_DELAY);
if (pcmChkQHdl != NULL) {
ESP_LOGE(TAG,
"Couldn't get PCM chunk, recv: messages waiting %d, "
"diff2Server: %llds, %lld.%lldms",
uxQueueMessagesWaiting(pcmChkQHdl), sec, msec, usec);
}
// xSemaphoreGive(playerPcmQueueMux);
dir = 0;
initialSync = 0;
audio_set_mute(true);
// i2s_stop(I2S_NUM_0);
i2s_channel_disable(tx_chan);
}
}
} }

11
main/Kconfig.projbuild
View File

@@ -33,4 +33,15 @@ menu "Snapclient Configuration"
HTTP server port to use. HTTP server port to use.
endmenu endmenu
config USE_SAMPLE_INSERTION
bool "Use sample insertion"
default true
help
There are two syncronization implementations.
1. APLL tuning (ONLY use with DACs having MCLK input)
2. sample insertion (duplicates a sample now and then to keep up sync)
Both approaches have similar performance keeping clients in sync <= 500µs
endmenu endmenu

2
main/main.c
View File

@@ -2779,7 +2779,7 @@ void app_main(void) {
gpio_config(&cfg); gpio_config(&cfg);
#endif #endif
#if CONFIG_AUDIO_BOARD_CUSTOM #if CONFIG_AUDIO_BOARD_CUSTOM && CONFIG_DAC_ADAU1961
// some codecs need i2s mclk for initialization // some codecs need i2s mclk for initialization
i2s_chan_handle_t tx_chan; i2s_chan_handle_t tx_chan;

4
sdkconfig
View File

@@ -1,6 +1,6 @@
# #
# Automatically generated file. DO NOT EDIT. # Automatically generated file. DO NOT EDIT.
# Espressif IoT Development Framework (ESP-IDF) 5.1.1 Project Configuration # Espressif IoT Development Framework (ESP-IDF) Project Configuration
# #
CONFIG_SOC_BROWNOUT_RESET_SUPPORTED="Not determined" CONFIG_SOC_BROWNOUT_RESET_SUPPORTED="Not determined"
CONFIG_SOC_TWAI_BRP_DIV_SUPPORTED="Not determined" CONFIG_SOC_TWAI_BRP_DIV_SUPPORTED="Not determined"
@@ -351,6 +351,8 @@ CONFIG_SNAPCLIENT_NAME="esp-snapclient"
# #
CONFIG_WEB_PORT=8000 CONFIG_WEB_PORT=8000
# end of HTTP Server Setting # end of HTTP Server Setting
CONFIG_USE_SAMPLE_INSERTION=y
# end of Snapclient Configuration # end of Snapclient Configuration
# #

10
sdkconfig.old
View File

@@ -351,14 +351,16 @@ CONFIG_SNAPCLIENT_NAME="esp-snapclient"
# #
CONFIG_WEB_PORT=8000 CONFIG_WEB_PORT=8000
# end of HTTP Server Setting # end of HTTP Server Setting
CONFIG_USE_SAMPLE_INSERTION=y
# end of Snapclient Configuration # end of Snapclient Configuration
# #
# Audio HAL # Audio HAL
# #
# CONFIG_AUDIO_BOARD_CUSTOM is not set # CONFIG_AUDIO_BOARD_CUSTOM is not set
# CONFIG_ESP_LYRAT_V4_3_BOARD is not set CONFIG_ESP_LYRAT_V4_3_BOARD=y
CONFIG_ESP_LYRAT_MINI_V1_1_BOARD=y # CONFIG_ESP_LYRAT_MINI_V1_1_BOARD is not set
# end of Audio HAL # end of Audio HAL
# #
@@ -384,8 +386,8 @@ CONFIG_SNTP_SERVER="pool.ntp.org"
# Wifi Configuration # Wifi Configuration
# #
# CONFIG_ENABLE_WIFI_PROVISIONING is not set # CONFIG_ENABLE_WIFI_PROVISIONING is not set
CONFIG_WIFI_SSID="" CONFIG_WIFI_SSID="zuhause"
CONFIG_WIFI_PASSWORD="" CONFIG_WIFI_PASSWORD="dErtischlEr"
CONFIG_WIFI_MAXIMUM_RETRY=0 CONFIG_WIFI_MAXIMUM_RETRY=0
# end of Wifi Configuration # end of Wifi Configuration