Enable the AirPlay 2 build to operate an optional classic-AirPlay-only service or to gracefully degrade to classic AirPlay, as follows:
1. Add a new command-line option '-—service-type=<type>' and an equivalent configuration entry 'service_type = "<type>"' in the 'general' section of the configuration file,
where <type> can be "auto", "classic" or "airplay2":
1. "auto" (default) means that the service will be AirPlay 2 if NQPTP is running. If NQPTP is not running, classic AirPlay service will be provided instead, and in that case,
"(Classic)" will be appended to the default AirPlay service name visible to AirPlay clients like Apple Music, for example "RaspberryPi3B (Classic)".
2. "classic" means the service will be classic AirPlay (aka AirPlay 1).
3. "airplay2" means the service will be the modern AirPlay 2. In this case, as distinct from "auto", if NQPTP is not running, Shairport Sync will log an error and terminate.
2. In the systemd service file, NQPTP is now a "Want" rather than a "Require". If it's present, then it will be launched before Shairport Sync. If it's absent, Shairport Sync will launch anyway.
3. Improve the delivery of input format changes and emit 'sdsc' metadata when changes occur.
4. Emit new format information in the log if statistics is enabled.
Docker Changes
1. Support for linux/arm/v6 has been dropped, as Docker is no longer supported.
2. NQPTP is not started in the AirPlay 2 Docker image if '--service-type=classic' or '--service-type=airplay1' is in the command line options at the end of the docker run command.
The purpose is to ensure that ports 319 and 320 are left alone when the AirPlay 2 image is set to provide Classic service only.
Note that setting the configuration file 'service_type' to 'classic' will not prevent NQPTP from starting up -- you must use the command line option.
3. A new "dev" target has been added. It is a large image containing the custom-built FFmpeg library, NQPTP, Avahi and D-Bus along with the Shairport Sync source and
all necessary development tools. When started, Avahi, D-Bus and NQPTP are all installed and running. The bash shell has also been added and is entered.
Stability Improvements
Reorganise session preemption to fully terminate the existing session before starting a new one.
Don't delay closing the event port to wait for it to be closed at the client end.
Add a safe_socket_close() function to ensure sockets are fully closed. Use -1 to designate closed rather than 0, to prevent attempts to reclose sockets, causing mayhem.
Re-order FFmpeg decommissioning during teardown.
72 lines
2.0 KiB
C++
72 lines
2.0 KiB
C++
#ifndef CONVOLVER_THREAD_POOL_H
|
|
#define CONVOLVER_THREAD_POOL_H
|
|
|
|
#include "FFTConvolver.h"
|
|
#include <cassert>
|
|
#include <condition_variable>
|
|
#include <functional>
|
|
#include <mutex>
|
|
#include <queue>
|
|
#include <thread>
|
|
#include <vector>
|
|
|
|
// Use the fftconvolver namespace
|
|
using fftconvolver::FFTConvolver;
|
|
using fftconvolver::Sample;
|
|
|
|
class ConvolverThreadPool {
|
|
private:
|
|
std::vector<FFTConvolver *> _convolvers;
|
|
std::vector<std::thread> _threads;
|
|
std::queue<std::function<void()>> _taskQueue;
|
|
std::mutex _queueMutex;
|
|
std::condition_variable _condition;
|
|
std::condition_variable _completionCV;
|
|
bool _stop;
|
|
size_t _activeTasks;
|
|
|
|
public:
|
|
ConvolverThreadPool();
|
|
~ConvolverThreadPool();
|
|
|
|
// Initialize the thread pool (creates convolvers but doesn't initialize them)
|
|
// numThreads: number of worker threads (level of parallelism)
|
|
// numConvolvers: total number of convolver instances
|
|
bool init(size_t numThreads, size_t numConvolvers);
|
|
|
|
// Initialize a specific convolver with its IR
|
|
// convolverId: which convolver to initialize
|
|
// blockSize: block size for convolution
|
|
// ir: impulse response data
|
|
// irLen: length of impulse response
|
|
bool initConvolver(size_t convolverId, size_t blockSize, const Sample *ir, size_t irLen);
|
|
|
|
// Initialize all convolvers with the same IR
|
|
bool initAllConvolvers(size_t blockSize, const Sample *ir, size_t irLen);
|
|
|
|
// Queue a convolution task (non-blocking)
|
|
void processAsync(size_t convolverId, const Sample *input, Sample *output, size_t len);
|
|
|
|
// Wait for all queued tasks to complete (blocking)
|
|
void waitForAll();
|
|
|
|
// Clear the state of a specific convolver
|
|
void clearState(size_t convolverId);
|
|
|
|
// Clear the state of all convolvers
|
|
void clearAllStates();
|
|
|
|
// Get the number of convolvers
|
|
size_t getNumConvolvers() const { return _convolvers.size(); }
|
|
|
|
// Get the number of threads
|
|
size_t getNumThreads() const { return _threads.size(); }
|
|
|
|
void shutdown();
|
|
|
|
private:
|
|
void workerThread();
|
|
// void shutdown();
|
|
};
|
|
|
|
#endif // CONVOLVER_THREAD_POOL_H
|