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

AirPlay: retry NTP sync when initial RTT is >100ms - release

Browse Source
This commit is contained in:
philippe44
2020-02-01 23:21:59 -08:00
parent e4d02aa3e4
commit 3c0957d110
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
components/raop/rtp.c
View File

@@ -564,7 +564,7 @@ static void *rtp_thread_func(void *arg) {
bool ntp_sent; bool ntp_sent;
char *packet = malloc(MAX_PACKET); char *packet = malloc(MAX_PACKET);
rtp_t *ctx = (rtp_t*) arg; rtp_t *ctx = (rtp_t*) arg;
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
if (ctx->rtp_sockets[i].sock > sock) sock = ctx->rtp_sockets[i].sock; if (ctx->rtp_sockets[i].sock > sock) sock = ctx->rtp_sockets[i].sock;
// send synchro request 3 times // send synchro request 3 times
@@ -638,7 +638,9 @@ static void *rtp_thread_func(void *arg) {
u32_t rtp_now_latency = ntohl(*(u32_t*)(pktp+4)); u32_t rtp_now_latency = ntohl(*(u32_t*)(pktp+4));
u64_t remote = (((u64_t) ntohl(*(u32_t*)(pktp+8))) << 32) + ntohl(*(u32_t*)(pktp+12)); u64_t remote = (((u64_t) ntohl(*(u32_t*)(pktp+8))) << 32) + ntohl(*(u32_t*)(pktp+12));
u32_t rtp_now = ntohl(*(u32_t*)(pktp+16)); u32_t rtp_now = ntohl(*(u32_t*)(pktp+16));
u16_t flags = ntohs(*(u16_t*)(pktp+2));
u32_t remote_gap = NTP2MS(remote - ctx->timing.remote); u32_t remote_gap = NTP2MS(remote - ctx->timing.remote);
// something is wrong and if we are supposed to be NTP synced, better ask for re-sync // something is wrong and if we are supposed to be NTP synced, better ask for re-sync
if (remote_gap > 10000) { if (remote_gap > 10000) {
if (ctx->synchro.status & NTP_SYNC) rtp_request_timing(ctx); if (ctx->synchro.status & NTP_SYNC) rtp_request_timing(ctx);
@@ -683,8 +685,9 @@ static void *rtp_thread_func(void *arg) {
case 0x53: { case 0x53: {
u64_t expected; u64_t expected;
u32_t reference = ntohl(*(u32_t*)(pktp+12)); // only low 32 bits in our case u32_t reference = ntohl(*(u32_t*)(pktp+12)); // only low 32 bits in our case
u64_t remote =(((u64_t) ntohl(*(u32_t*)(pktp+16))) << 32) + ntohl(*(u32_t*)(pktp+20)); u64_t remote =(((u64_t) ntohl(*(u32_t*)(pktp+16))) << 32) + ntohl(*(u32_t*)(pktp+20));
u32_t roundtrip = gettime_ms() - reference; u32_t roundtrip = gettime_ms() - reference;
// better discard sync packets when roundtrip is suspicious and ask for another one // better discard sync packets when roundtrip is suspicious and ask for another one
if (roundtrip > 100) { if (roundtrip > 100) {
rtp_request_timing(ctx); rtp_request_timing(ctx);