From 3048817c0b26e32bd207fde2a560b54f4f5a9a4e Mon Sep 17 00:00:00 2001 From: chme Date: Sun, 9 Jul 2017 11:15:02 +0200 Subject: [PATCH 1/3] [player] Add warning log message if overrun is detected but player is still able to catch up --- src/player.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/player.c b/src/player.c index e8f3d158..78fddaf0 100644 --- a/src/player.c +++ b/src/player.c @@ -1097,7 +1097,12 @@ playback_cb(int fd, short what, void *arg) return; } else - pb_write_recovery = 0; + { + if (overrun > 0) + DPRINTF(E_WARN, L_PLAYER, "Output delay detected: player is %" PRIu64 " ticks behind, catching up\n", overrun); + + pb_write_recovery = 0; + } // If there was an overrun, we will try to read/write a corresponding number // of times so we catch up. The read from the input is non-blocking, so it From ecb41eccca1f6c84245e573d49d7bd7d3f314264 Mon Sep 17 00:00:00 2001 From: chme Date: Sun, 9 Jul 2017 11:15:59 +0200 Subject: [PATCH 2/3] [player] Use false/true for boolean field --- src/player.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/player.c b/src/player.c index 78fddaf0..b48540dc 100644 --- a/src/player.c +++ b/src/player.c @@ -1092,7 +1092,7 @@ playback_cb(int fd, short what, void *arg) } DPRINTF(E_LOG, L_PLAYER, "Output delay detected (behind=%" PRIu64 ", max=%d), resetting all outputs\n", overrun, pb_write_deficit_max); - pb_write_recovery = 1; + pb_write_recovery = true; playback_suspend(); return; } @@ -1101,7 +1101,7 @@ playback_cb(int fd, short what, void *arg) if (overrun > 0) DPRINTF(E_WARN, L_PLAYER, "Output delay detected: player is %" PRIu64 " ticks behind, catching up\n", overrun); - pb_write_recovery = 0; + pb_write_recovery = false; } // If there was an overrun, we will try to read/write a corresponding number From e136c726c1a786c87bee7307a58107217c90e7a1 Mon Sep 17 00:00:00 2001 From: chme Date: Sun, 9 Jul 2017 11:18:55 +0200 Subject: [PATCH 3/3] [raop] Add device name to log message for retransmit requests --- src/outputs/raop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/outputs/raop.c b/src/outputs/raop.c index 7f180b5f..e0a5736c 100644 --- a/src/outputs/raop.c +++ b/src/outputs/raop.c @@ -3096,7 +3096,7 @@ raop_v2_control_cb(int fd, short what, void *arg) seq_start = be16toh(seq_start); seq_len = be16toh(seq_len); - DPRINTF(E_DBG, L_RAOP, "Got retransmit request, seq_start %u len %u\n", seq_start, seq_len); + DPRINTF(E_DBG, L_RAOP, "Got retransmit request from '%s', seq_start %u len %u\n", rs->devname, seq_start, seq_len); raop_v2_resend_range(rs, seq_start, seq_len);