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

Merge remote-tracking branch 'origin/master' into master-cmake

Browse Source 
Conflicts:
	components/raop/rtp.c
	components/squeezelite/display.c
This commit is contained in:
Sebastien
2020-04-06 10:39:55 -04:00
parent fcf86c5e75 1ab183335e
commit 602b5564b0
14 changed files with 364 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/raop/rtp.c
View File

@@ -435,7 +435,7 @@ static void buffer_put_packet(rtp_t *ctx, seq_t seqno, unsigned rtptime, bool fi
ctx->ab_write = seqno-1;
ctx->ab_read = seqno;
ctx->flush_seqno = -1;
ctx->playing = true;
ctx->playing = true;
ctx->resent_req = ctx->resent_rec = ctx->silent_frames = ctx->discarded = 0;
playtime = ctx->synchro.time + ((rtptime - ctx->synchro.rtp) * 10) / (RAOP_SAMPLE_RATE / 100);
ctx->cmd_cb(RAOP_PLAY, playtime);
@@ -518,7 +518,7 @@ static void buffer_push_packet(rtp_t *ctx) {
// re-evaluate time in loop in case data callback blocks ...
now = gettime_ms();
// try to manage playtime so that we overflow as late as possible if we miss NTP (2^31 / 10 / 44100)
// try to manage playtime so that we overflow as late as possible if we miss NTP (2^31 / 10 / 44100)
curframe = ctx->audio_buffer + BUFIDX(ctx->ab_read);
playtime = ctx->synchro.time + ((curframe->rtptime - ctx->synchro.rtp) * 10) / (RAOP_SAMPLE_RATE / 100);