From: Mike Brady <4265913+mikebrady@users.noreply.github.com> Date: Fri, 26 Nov 2021 15:18:27 +0000 (+0000) Subject: Add some debug messages to help check the output rate calculations. X-Git-Tag: 4.1-rc1~24^2~367^2~4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b9d3abfa2421143788f2474aeaed7aeaca73e034;p=thirdparty%2Fshairport-sync.git Add some debug messages to help check the output rate calculations. --- diff --git a/player.c b/player.c index 824aa871..e568cc87 100644 --- a/player.c +++ b/player.c @@ -2332,27 +2332,25 @@ void *player_thread_func(void *arg) { conn->input_frame_rate = 0.0; } - int stats_status = -1; + int stats_status = 0; if ((config.output->delay) && (config.no_sync == 0) && (config.output->stats)) { uint64_t frames_sent_for_play; uint64_t measurement_time; uint64_t actual_delay; stats_status = config.output->stats(&measurement_time, &actual_delay, &frames_sent_for_play); - // debug(1,"actual_delay: %" PRIu64 ", frames_sent_for_play: %" PRIu64 ", - // frames_played: %" PRIu64 ".", actual_delay, frames_sent_for_play, - // frames_sent_for_play - actual_delay); + debug(1,"status: %d, actual_delay: %" PRIu64 ", frames_sent_for_play: %" PRIu64 ", frames_played: %" PRIu64 ".", stats_status, actual_delay, frames_sent_for_play, frames_sent_for_play - actual_delay); uint64_t frames_played = frames_sent_for_play - actual_delay; // If the status is zero, it means that there were no output problems since the // last time the stats call was made. Thus, the frame rate should be valid. - if ((stats_status == 0) && (previous_frames_played_valid)) { + if ((stats_status == 0) && (previous_frames_played_valid != 0)) { uint64_t frames_played_in_this_interval = frames_played - previous_frames_played; - uint64_t interval = measurement_time - previous_frames_played_time; - // debug(1,"frames_played_in_this_interval: %" PRIu64 ", interval: %" PRIu64 ".", - // frames_played_in_this_interval, interval); + int64_t interval = measurement_time - previous_frames_played_time; if (interval != 0) { conn->frame_rate = (1e9 * frames_played_in_this_interval) / interval; conn->frame_rate_valid = 1; + debug(1,"frames_played_in_this_interval: %" PRIu64 ", interval: %" PRId64 ", rate: %f.", + frames_played_in_this_interval, interval, conn->frame_rate); } }