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

more synchro tweaks

Browse Source
This commit is contained in:
philippe44
2019-07-07 15:07:59 -07:00
parent a0efacf4e6
commit c71b12b74f
1 changed files with 18 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
components/squeezelite/output_i2s.c
View File

@@ -242,11 +242,11 @@ static int _i2s_write_frames(frames_t out_frames, bool silence, s32_t gainL, s32
* Main output thread * Main output thread
*/ */
static void *output_thread_i2s() { static void *output_thread_i2s() {
frames_t frames = 0; frames_t iframes = FRAME_BLOCK, oframes;
size_t bytes; size_t bytes;
uint32_t timer_start = 0; uint32_t timer_start = 0;
int discard = DMA_BUF_COUNT * DMA_BUF_LEN; int discard = 0;
uint32_t jitter = gettime_ms(); uint32_t fullness = gettime_ms();
while (running) { while (running) {
@@ -266,31 +266,26 @@ static void *output_thread_i2s() {
} }
output.updated = gettime_ms(); output.updated = gettime_ms();
output.frames_played_dmp = output.frames_played;
// try to estimate how much we have consumed from the DMA buffer // try to estimate how much we have consumed from the DMA buffer
output.frames_played_dmp = output.frames_played - ((output.updated - jitter) * output.current_sample_rate) / 1000; output.device_frames = DMA_BUF_COUNT * DMA_BUF_LEN - ((output.updated - fullness) * output.current_sample_rate) / 1000;
output.device_frames = DMA_BUF_COUNT * DMA_BUF_LEN;
frames = _output_frames( FRAME_BLOCK ); oframes = _output_frames( iframes );
SET_MIN_MAX_SIZED(frames,rec,FRAME_BLOCK); 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);
SET_MIN_MAX( TIME_MEASUREMENT_GET(timer_start),buffering); SET_MIN_MAX( TIME_MEASUREMENT_GET(timer_start),buffering);
// must skip first frames as buffer already filled with silence // must skip first whatever is in the pipe (not when resuming)
// if (output.state < OUTPUT_RUNNING || output.state == OUTPUT_START_AT) {
if (output.state == OUTPUT_START_AT) { if (output.state == OUTPUT_START_AT) {
discard = DMA_BUF_COUNT * DMA_BUF_LEN; discard = output.frames_played_dmp ? 0 : output.device_frames;
} else if (discard) { } else if (discard) {
discard -= output.frames_played + frames; discard -= oframes;
if (discard < 0) { iframes = discard ? min(FRAME_BLOCK, discard) : FRAME_BLOCK;
frames += discard;
discard = 0;
} else {
UNLOCK; UNLOCK;
continue; continue;
} }
}
UNLOCK; UNLOCK;
@@ -313,17 +308,15 @@ static void *output_thread_i2s() {
} }
// we assume that here we have been able to entirely fill the DMA buffers // we assume that here we have been able to entirely fill the DMA buffers
i2s_write(CONFIG_I2S_NUM, obuf, frames * bytes_per_frame, &bytes, portMAX_DELAY); i2s_write(CONFIG_I2S_NUM, obuf, oframes * bytes_per_frame, &bytes, portMAX_DELAY);
jitter = gettime_ms(); fullness = gettime_ms();
if (bytes != frames * bytes_per_frame) { if (bytes != oframes * bytes_per_frame) {
LOG_WARN("I2S DMA Overflow! available bytes: %d, I2S wrote %d bytes", frames * bytes_per_frame, bytes); LOG_WARN("I2S DMA Overflow! available bytes: %d, I2S wrote %d bytes", oframes * bytes_per_frame, bytes);
} }
SET_MIN_MAX( TIME_MEASUREMENT_GET(timer_start),i2s_time); SET_MIN_MAX( TIME_MEASUREMENT_GET(timer_start),i2s_time);
frames = 0;
} }
return 0; return 0;