New Features:
Multi-Channel and High-Resolution Audio Support
48,000 frames per second ("48k") operation.
48k lossless stereo support.
5.1 and 7.1 surround sound support.
Multi-channel and multi-rate operation on ALSA, PipeWire, PulseAudio, FreeBSD, stdout and Unix pipe output backends.
Automatic Audio Format Selection
Flexible and controllable output format selection.
Automatic rate, sample format, and channel count selection.
Full FFmpeg Integration
Support for transcoding.
Advanced resampling capabilities.
New audio format support.
Enhanced Resampling
New vernier resampling and interpolation method optimized for low-power CPUs.
Better performance on resource-constrained devices.
Convolution and Loudness Enhancements:
Convolution system is now multithreaded and works on stereo and multichannel audio at 48k and 44.1k.
Multiple impulse response (IR) files can now be provided via convolution_ir_files setting.
New convolution_thread_pool_size setting for multithreaded processing (defaults to 1).
Loudness processing now works with stereo and multichannel audio at 48k and 44.1k.
Updated to the most recent HiFi-LoFi FFT convolver.
MQTT Enhancements:
Added new publish_retain boolean option. When enabled, published MQTT messages have the retain flag set, so the MQTT broker stores the last message per topic and new subscribers receive the most recent value immediately. Thanks to lululombard for PR #2142.
D-Bus Enhancements:
Added new dbus_default_message_bus command-line argument (can be system or session) to set the default message bus for both D-Bus native service and MPRIS service.
Performance Improvements:
Enhanced compatibility with AirPlay 2 AutoMix and Smart Tracklists resulting in less unexplained track skipping.
Better operation on low-power devices down to Raspberry Pi B.
Improved efficiency on embedded systems.
Enhanced timestamp handling for better synchronization.
Improved sync error calculation.
Rebuilt buffered audio processor for cleaner handling of immediate and deferred flush requests.
Docker Enhancements:
Reduced Docker image sizes with slimmed-down FFmpeg library.
Removed dhclient from Docker images for smaller footprint.
Bug Fixes:
Fixed MQTT warning on service startup: "Could not establish a mqtt connection". The startup script now correctly states that the mosquitto service is required. Thanks to Hugo Villeneuve for PR #2137.
Fixed compatibility with mbedtls library version 3.4+ (present on recent Linux versions). Thanks to Christian Beier for finding and fixing the bug.
Fixed PulseAudio backend so that PA_ERR_NODATA returns "No latency data yet". Thanks to Vladimir Shakov for the report and fix.
Ensured old flush requests are deleted when a new play session starts. Thanks to saujanyashah for the report.
Fixed format warnings on 64-bit and 32-bit systems
Removed compilation warnings on 32-bit builds
Improved argument checking for debug(), inform(), warn() and die() functions
Fixed "daemon" typos throughout codebase. Thanks to Chris Boot for PR #1981.
Added warning if a convolution impulse response file cannot be read due to bad path or permissions
Build System Improvements:
Unified service file with variable substitution for Avahi support, making it easier to add future service dependencies. Thanks to Hugo Villeneuve.
Network interface selection now only considers interfaces that are up, running and not loopback interfaces. Thanks to Carl Johnson for the suggestion.
Configuration File Changes and Deprecations
New settings: convolution_ir_files (replaces convolution_ir_file), convolution_enabled (replaces convolution), convolution_max_length_in_seconds (replaces convolution_max_length), loudness_enabled (replaces loudness).
New convolution_thread_pool_size setting (defaults to 1).
Deprecated settings: convolution_ir_file, convolution, convolution_max_length, loudness.
Corresponding D-Bus methods and properties have been updated.
Deprecation Notice:
The Jack Audio and soundio backends are deprecated and will be removed in a future release. Consider using the updated PipeWire backend instead.
Documentation Updates
Updated BUILD.md with latest build instructions.
Updated AIRPLAY2.md with feature information.
Enhanced convolution and loudness documentation.
Maintenance:
Fixed FFmpeg deprecation warnings.
Bumped actions/checkout from 6.0.1 to 6.0.2.
Bumped docker/login-action from 3.6.0 to 3.7.0.
Bumped docker/build-push-action from 6.13.0 to 6.15.0.
Bumped docker/setup-qemu-action from 3.4.0 to 3.6.0.
Bumped docker/setup-buildx-action from 3.9.0 to 3.10.0.
254 lines
9.1 KiB
C
254 lines
9.1 KiB
C
/*
|
|
* Activity Monitor
|
|
*
|
|
* Contains code to run an activity flag and associated timer
|
|
* A pthread implements a simple state machine with three states,
|
|
* "idle", "active" and "timing out".
|
|
*
|
|
*
|
|
* This file is part of Shairport Sync.
|
|
* Copyright (c) Mike Brady 2019--2025
|
|
* All rights reserved.
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person
|
|
* obtaining a copy of this software and associated documentation
|
|
* files (the "Software"), to deal in the Software without
|
|
* restriction, including without limitation the rights to use,
|
|
* copy, modify, merge, publish, distribute, sublicense, and/or
|
|
* sell copies of the Software, and to permit persons to whom the
|
|
* Software is furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be
|
|
* included in all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
|
|
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
|
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
|
|
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
|
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
|
* OTHER DEALINGS IN THE SOFTWARE.
|
|
*/
|
|
|
|
#include <errno.h>
|
|
#include <inttypes.h>
|
|
#include <stdlib.h>
|
|
#include <sys/types.h>
|
|
|
|
#include "config.h"
|
|
|
|
#include "activity_monitor.h"
|
|
#include "common.h"
|
|
#include "rtsp.h"
|
|
|
|
#ifdef CONFIG_DBUS_INTERFACE
|
|
#include "dbus-service.h"
|
|
#endif
|
|
|
|
enum am_state state;
|
|
enum ps_state { ps_inactive, ps_active } player_state;
|
|
|
|
int activity_monitor_running = 0;
|
|
|
|
pthread_t activity_monitor_thread;
|
|
pthread_mutex_t activity_monitor_mutex;
|
|
pthread_cond_t activity_monitor_cv;
|
|
|
|
void going_active(int block) {
|
|
// debug(1, "activity_monitor: state transitioning to \"active\" with%s blocking", block ? "" :
|
|
// "out");
|
|
if (config.cmd_active_start)
|
|
command_execute(config.cmd_active_start, "", block);
|
|
#ifdef CONFIG_METADATA
|
|
debug(2, "abeg"); // active mode begin
|
|
send_ssnc_metadata('abeg', NULL, 0, 1); // contains cancellation points
|
|
#endif
|
|
|
|
#ifdef CONFIG_DBUS_INTERFACE
|
|
if (dbus_service_is_running())
|
|
shairport_sync_set_active(SHAIRPORT_SYNC(shairportSyncSkeleton), TRUE);
|
|
#endif
|
|
|
|
if (config.disable_standby_mode == disable_standby_auto) {
|
|
config.keep_dac_busy = 1;
|
|
}
|
|
}
|
|
|
|
void going_inactive(int block) {
|
|
// debug(1, "activity_monitor: state transitioning to \"inactive\" with%s blocking", block ? "" :
|
|
// "out");
|
|
if (config.cmd_active_stop)
|
|
command_execute(config.cmd_active_stop, "", block);
|
|
#ifdef CONFIG_METADATA
|
|
debug(2, "aend"); // active mode end
|
|
send_ssnc_metadata('aend', NULL, 0, 1); // contains cancellation points
|
|
#endif
|
|
|
|
#ifdef CONFIG_DBUS_INTERFACE
|
|
if (dbus_service_is_running())
|
|
shairport_sync_set_active(SHAIRPORT_SYNC(shairportSyncSkeleton), FALSE);
|
|
#endif
|
|
|
|
if (config.disable_standby_mode == disable_standby_auto) {
|
|
config.keep_dac_busy = 0;
|
|
}
|
|
}
|
|
|
|
void activity_monitor_signify_activity(int active) {
|
|
// this could be pthread_cancelled and there is likely to be cancellation points in the
|
|
// hooked-on procedures
|
|
pthread_mutex_lock(&activity_monitor_mutex);
|
|
player_state = active == 0 ? ps_inactive : ps_active;
|
|
// Now, although we could simply let the state machine in the activity monitor thread
|
|
// look after everything, we will change state here in two situations:
|
|
// 1. If the state machine is am_inactive and the player is ps_active
|
|
// we will change the state to am_active and execute the going_active() function.
|
|
// 2. If the state machine is am_active and the player is ps_inactive and
|
|
// the activity_idle_timeout is 0, then we will change the state to am_inactive and
|
|
// execute the going_inactive() function.
|
|
//
|
|
// The reason for all this is that we might want to perform the attached scripts
|
|
// and wait for them to complete before continuing. If they were performed in the
|
|
// activity monitor thread, then we couldn't wait for them to complete.
|
|
|
|
// So, if the active end procedure is on a timer, it will be executed when the
|
|
// timeout occurs and the "blocking" status is ignored.
|
|
|
|
if ((state == am_inactive) && (player_state == ps_active)) {
|
|
state = am_active;
|
|
pthread_mutex_unlock(&activity_monitor_mutex);
|
|
going_active(config.cmd_blocking);
|
|
} else if ((state == am_active) && (player_state == ps_inactive) &&
|
|
(config.active_state_timeout == 0.0)) {
|
|
state = am_inactive;
|
|
pthread_mutex_unlock(&activity_monitor_mutex);
|
|
going_inactive(config.cmd_blocking);
|
|
} else {
|
|
pthread_mutex_unlock(&activity_monitor_mutex);
|
|
}
|
|
// lock the mutex again to send a signal
|
|
pthread_cleanup_debug_mutex_lock(&activity_monitor_mutex, 10000, 1);
|
|
pthread_cond_signal(&activity_monitor_cv);
|
|
pthread_cleanup_pop(1); // release the mutex
|
|
}
|
|
|
|
void activity_thread_cleanup_handler(__attribute__((unused)) void *arg) {
|
|
debug(3, "activity_monitor: thread exit.");
|
|
pthread_cond_destroy(&activity_monitor_cv);
|
|
pthread_mutex_destroy(&activity_monitor_mutex);
|
|
}
|
|
|
|
void *activity_monitor_thread_code(void *arg) {
|
|
int rc = pthread_mutex_init(&activity_monitor_mutex, NULL);
|
|
if (rc)
|
|
die("activity_monitor: error %d initialising activity_monitor_mutex.", rc);
|
|
|
|
rc = pthread_cond_init(&activity_monitor_cv, NULL);
|
|
if (rc)
|
|
die("activity_monitor: error %d initialising activity_monitor_cv.", rc);
|
|
pthread_cleanup_push(activity_thread_cleanup_handler, arg);
|
|
|
|
uint64_t sec;
|
|
uint64_t nsec;
|
|
struct timespec time_for_wait;
|
|
|
|
state = am_inactive;
|
|
player_state = ps_inactive;
|
|
|
|
pthread_mutex_lock(&activity_monitor_mutex);
|
|
do {
|
|
switch (state) {
|
|
case am_inactive:
|
|
debug(2, "am_state: am_inactive");
|
|
while (player_state != ps_active)
|
|
pthread_cond_wait(&activity_monitor_cv, &activity_monitor_mutex);
|
|
// state = am_active; this is done by the activity_monitor_signify_activity(1) function
|
|
debug(2, "am_state: am_active");
|
|
break;
|
|
case am_active:
|
|
// debug(1,"am_state: am_active");
|
|
while (player_state != ps_inactive)
|
|
pthread_cond_wait(&activity_monitor_cv, &activity_monitor_mutex);
|
|
|
|
// if it's not already am_inactive, the it should be beginning to time out...
|
|
if (state != am_inactive) {
|
|
state = am_timing_out;
|
|
|
|
uint64_t time_to_wait_for_wakeup_ns = (uint64_t)(config.active_state_timeout * 1000000000);
|
|
|
|
#ifdef COMPILE_FOR_LINUX_AND_FREEBSD_AND_CYGWIN_AND_OPENBSD
|
|
uint64_t time_of_wakeup_ns = get_realtime_in_ns() + time_to_wait_for_wakeup_ns;
|
|
sec = time_of_wakeup_ns / 1000000000;
|
|
nsec = time_of_wakeup_ns % 1000000000;
|
|
time_for_wait.tv_sec = sec;
|
|
time_for_wait.tv_nsec = nsec;
|
|
#endif
|
|
|
|
#ifdef COMPILE_FOR_OSX
|
|
sec = time_to_wait_for_wakeup_ns / 1000000000;
|
|
nsec = time_to_wait_for_wakeup_ns % 1000000000;
|
|
time_for_wait.tv_sec = sec;
|
|
time_for_wait.tv_nsec = nsec;
|
|
#endif
|
|
}
|
|
break;
|
|
case am_timing_out:
|
|
rc = 0;
|
|
while ((player_state != ps_active) && (rc != ETIMEDOUT)) {
|
|
#ifdef COMPILE_FOR_LINUX_AND_FREEBSD_AND_CYGWIN_AND_OPENBSD
|
|
rc = pthread_cond_timedwait(&activity_monitor_cv, &activity_monitor_mutex,
|
|
&time_for_wait); // this is a pthread cancellation point
|
|
#endif
|
|
#ifdef COMPILE_FOR_OSX
|
|
rc = pthread_cond_timedwait_relative_np(&activity_monitor_cv, &activity_monitor_mutex,
|
|
&time_for_wait);
|
|
#endif
|
|
}
|
|
if (player_state == ps_active)
|
|
state = am_active; // player has gone active -- do nothing, because it's still active
|
|
else if (rc == ETIMEDOUT) {
|
|
state = am_inactive;
|
|
pthread_mutex_unlock(&activity_monitor_mutex);
|
|
going_inactive(0); // don't wait for completion -- it makes no sense
|
|
pthread_mutex_lock(&activity_monitor_mutex);
|
|
} else {
|
|
// activity monitor was woken up in the state am_timing_out, but not by a timeout and player
|
|
// is not in ps_active state
|
|
debug(1,
|
|
"activity monitor was woken up in the state am_timing_out, but didn't change state");
|
|
}
|
|
break;
|
|
default:
|
|
debug(1, "activity monitor in an illegal state!");
|
|
state = am_inactive;
|
|
break;
|
|
}
|
|
} while (1);
|
|
pthread_mutex_unlock(&activity_monitor_mutex);
|
|
pthread_cleanup_pop(0); // should never happen
|
|
pthread_exit(NULL);
|
|
}
|
|
|
|
enum am_state activity_status() { return (state); }
|
|
|
|
void activity_monitor_start() {
|
|
// debug(1,"activity_monitor_start");
|
|
named_pthread_create(&activity_monitor_thread, NULL, activity_monitor_thread_code, NULL,
|
|
"activity_mon");
|
|
activity_monitor_running = 1;
|
|
}
|
|
|
|
void activity_monitor_stop() {
|
|
if (activity_monitor_running) {
|
|
debug(2, "activity_monitor_stop begin. state: %d, player_state: %d.", state, player_state);
|
|
if ((state == am_active) || (state == am_timing_out)) {
|
|
going_inactive(config.cmd_blocking);
|
|
state = am_inactive;
|
|
}
|
|
pthread_cancel(activity_monitor_thread);
|
|
pthread_join(activity_monitor_thread, NULL);
|
|
debug(2, "activity_monitor_stop complete");
|
|
}
|
|
}
|