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

correct division through zero error in player_task()

Browse Source 
Signed-off-by: Karl Osterseher <karli_o@gmx.at>
This commit is contained in:
Karl Osterseher
2022-12-14 23:14:02 +01:00
Unverified
parent 02206b21fb
commit 83928dccf3
2 changed files with 37 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
components/lightsnapcast/player.c
View File

@@ -883,7 +883,9 @@ int32_t allocate_pcm_chunk_memory(pcm_chunk_message_t **pcmChunk,
#endif #endif
if (ret < 0) { if (ret < 0) {
ESP_LOGE(TAG, "couldn't get memory to insert chunk"); ESP_LOGW(TAG,
"couldn't get memory to insert chunk, inserting an chunk "
"containing just 0");
ESP_LOGI( ESP_LOGI(
TAG, "%d, %d, %d, %d, %d", heap_caps_get_free_size(MALLOC_CAP_8BIT), TAG, "%d, %d, %d, %d, %d", heap_caps_get_free_size(MALLOC_CAP_8BIT),
@@ -950,7 +952,7 @@ static void player_task(void *pvParameters) {
int64_t serverNow = 0; int64_t serverNow = 0;
int64_t age; int64_t age;
BaseType_t ret; BaseType_t ret;
int64_t chkDur_us; int64_t chkDur_us = 24000;
char *p_payload = NULL; char *p_payload = NULL;
size_t size = 0; size_t size = 0;
uint32_t notifiedValue; uint32_t notifiedValue;
@@ -964,7 +966,7 @@ static void player_task(void *pvParameters) {
pcm_chunk_fragment_t *fragment = NULL; pcm_chunk_fragment_t *fragment = NULL;
size_t written; size_t written;
bool gotSnapserverConfig = false; bool gotSnapserverConfig = false;
int64_t clientDacLatency_us; int64_t clientDacLatency_us = 0;
int64_t diff2Server; int64_t diff2Server;
int64_t outputBufferDacTime = 0; int64_t outputBufferDacTime = 0;
@@ -992,18 +994,22 @@ static void player_task(void *pvParameters) {
player_get_snapcast_settings(&__scSet); player_get_snapcast_settings(&__scSet);
buf_us = (int64_t)(__scSet.buf_ms) * 1000LL; if ((__scSet.buf_ms > 0) && (__scSet.chkInFrames > 0) &&
(__scSet.sr > 0)) {
buf_us = (int64_t)(__scSet.buf_ms) * 1000LL;
chkDur_us = ESP_LOGE(TAG, "%d, SR %d", __scSet.chkInFrames, __scSet.sr);
(int64_t)__scSet.chkInFrames * (int64_t)1E6 / (int64_t)__scSet.sr;
clientDacLatency_us = (int64_t)__scSet.cDacLat_ms * 1000;
// this value is highly coupled with I2S DMA buffer chkDur_us =
// size. DMA buffer has a size of 1 chunk (e.g. 20ms) (int64_t)__scSet.chkInFrames * (int64_t)1E6 / (int64_t)__scSet.sr;
// so next chunk we get from queue will be -20ms
outputBufferDacTime = chkDur_us * CHNK_CTRL_CNT; // this value is highly coupled with I2S DMA buffer
// size. DMA buffer has a size of 1 chunk (e.g. 20ms)
// so next chunk we get from queue will be -20ms
outputBufferDacTime = chkDur_us * CHNK_CTRL_CNT;
clientDacLatency_us = (int64_t)__scSet.cDacLat_ms * 1000;
if ((__scSet.buf_ms > 0) && (__scSet.chkInFrames > 0)) {
if ((scSet.sr != __scSet.sr) || (scSet.bits != __scSet.bits) || if ((scSet.sr != __scSet.sr) || (scSet.bits != __scSet.bits) ||
(scSet.ch != __scSet.ch)) { (scSet.ch != __scSet.ch)) {
i2s_custom_stop(I2S_NUM_0); i2s_custom_stop(I2S_NUM_0);
@@ -1038,17 +1044,18 @@ static void player_task(void *pvParameters) {
ESP_LOGI(TAG, "created new queue with %d", entries); ESP_LOGI(TAG, "created new queue with %d", entries);
} }
ESP_LOGI(TAG,
"snapserver config changed, buffer %dms, chunk %d frames, "
"sample rate %d, ch %d, bits %d mute %d latency %d",
__scSet.buf_ms, __scSet.chkInFrames, __scSet.sr, __scSet.ch,
__scSet.bits, __scSet.muted, __scSet.cDacLat_ms);
scSet = __scSet; // store for next round
gotSnapserverConfig = true;
} }
ESP_LOGI(TAG,
"snapserver config changed, buffer %dms, chunk %d frames, "
"sample rate %d, ch %d, bits %d mute %d latency %d",
__scSet.buf_ms, __scSet.chkInFrames, __scSet.sr, __scSet.ch,
__scSet.bits, __scSet.muted, __scSet.cDacLat_ms);
scSet = __scSet; // store for next round
gotSnapserverConfig = true;
} else if (gotSnapserverConfig == false) { } else if (gotSnapserverConfig == false) {
// ESP_LOGW(TAG, "no snapserver config yet, keep waiting"); // ESP_LOGW(TAG, "no snapserver config yet, keep waiting");

9
main/main.c
View File

@@ -1233,6 +1233,15 @@ static void http_get_task(void *pvParameters) {
// need to release mutex // need to release mutex
// afterwards for next round // afterwards for next round
xSemaphoreGive(decoderReadSemaphore); xSemaphoreGive(decoderReadSemaphore);
// ESP_LOGI(
// TAG, "8bit %d, block %d, 32 bit %d, block %d",
// heap_caps_get_free_size(MALLOC_CAP_8BIT),
// heap_caps_get_largest_free_block(MALLOC_CAP_8BIT),
// heap_caps_get_free_size(MALLOC_CAP_32BIT |
// MALLOC_CAP_EXEC),
// heap_caps_get_largest_free_block(MALLOC_CAP_32BIT
// | MALLOC_CAP_EXEC));
#endif #endif
break; break;