Mike Brady
f30dd7aee6
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.
100 lines
4.1 KiB
C++
100 lines
4.1 KiB
C++
// ==================================================================================
|
|
// Copyright (c) 2017 HiFi-LoFi
|
|
//
|
|
// 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 "Utilities.h"
|
|
|
|
namespace fftconvolver {
|
|
|
|
bool SSEEnabled() {
|
|
#if defined(FFTCONVOLVER_USE_SSE)
|
|
return true;
|
|
#else
|
|
return false;
|
|
#endif
|
|
}
|
|
|
|
void Sum(Sample *FFTCONVOLVER_RESTRICT result, const Sample *FFTCONVOLVER_RESTRICT a,
|
|
const Sample *FFTCONVOLVER_RESTRICT b, size_t len) {
|
|
const size_t end4 = 4 * (len / 4);
|
|
for (size_t i = 0; i < end4; i += 4) {
|
|
result[i + 0] = a[i + 0] + b[i + 0];
|
|
result[i + 1] = a[i + 1] + b[i + 1];
|
|
result[i + 2] = a[i + 2] + b[i + 2];
|
|
result[i + 3] = a[i + 3] + b[i + 3];
|
|
}
|
|
for (size_t i = end4; i < len; ++i) {
|
|
result[i] = a[i] + b[i];
|
|
}
|
|
}
|
|
|
|
void ComplexMultiplyAccumulate(SplitComplex &result, const SplitComplex &a, const SplitComplex &b) {
|
|
assert(result.size() == a.size());
|
|
assert(result.size() == b.size());
|
|
ComplexMultiplyAccumulate(result.re(), result.im(), a.re(), a.im(), b.re(), b.im(),
|
|
result.size());
|
|
}
|
|
|
|
void ComplexMultiplyAccumulate(Sample *FFTCONVOLVER_RESTRICT re, Sample *FFTCONVOLVER_RESTRICT im,
|
|
const Sample *FFTCONVOLVER_RESTRICT reA,
|
|
const Sample *FFTCONVOLVER_RESTRICT imA,
|
|
const Sample *FFTCONVOLVER_RESTRICT reB,
|
|
const Sample *FFTCONVOLVER_RESTRICT imB, const size_t len) {
|
|
#if defined(FFTCONVOLVER_USE_SSE)
|
|
const size_t end4 = 4 * (len / 4);
|
|
for (size_t i = 0; i < end4; i += 4) {
|
|
const __m128 ra = _mm_load_ps(&reA[i]);
|
|
const __m128 rb = _mm_load_ps(&reB[i]);
|
|
const __m128 ia = _mm_load_ps(&imA[i]);
|
|
const __m128 ib = _mm_load_ps(&imB[i]);
|
|
__m128 real = _mm_load_ps(&re[i]);
|
|
__m128 imag = _mm_load_ps(&im[i]);
|
|
real = _mm_add_ps(real, _mm_mul_ps(ra, rb));
|
|
real = _mm_sub_ps(real, _mm_mul_ps(ia, ib));
|
|
_mm_store_ps(&re[i], real);
|
|
imag = _mm_add_ps(imag, _mm_mul_ps(ra, ib));
|
|
imag = _mm_add_ps(imag, _mm_mul_ps(ia, rb));
|
|
_mm_store_ps(&im[i], imag);
|
|
}
|
|
for (size_t i = end4; i < len; ++i) {
|
|
re[i] += reA[i] * reB[i] - imA[i] * imB[i];
|
|
im[i] += reA[i] * imB[i] + imA[i] * reB[i];
|
|
}
|
|
#else
|
|
const size_t end4 = 4 * (len / 4);
|
|
for (size_t i = 0; i < end4; i += 4) {
|
|
re[i + 0] += reA[i + 0] * reB[i + 0] - imA[i + 0] * imB[i + 0];
|
|
re[i + 1] += reA[i + 1] * reB[i + 1] - imA[i + 1] * imB[i + 1];
|
|
re[i + 2] += reA[i + 2] * reB[i + 2] - imA[i + 2] * imB[i + 2];
|
|
re[i + 3] += reA[i + 3] * reB[i + 3] - imA[i + 3] * imB[i + 3];
|
|
im[i + 0] += reA[i + 0] * imB[i + 0] + imA[i + 0] * reB[i + 0];
|
|
im[i + 1] += reA[i + 1] * imB[i + 1] + imA[i + 1] * reB[i + 1];
|
|
im[i + 2] += reA[i + 2] * imB[i + 2] + imA[i + 2] * reB[i + 2];
|
|
im[i + 3] += reA[i + 3] * imB[i + 3] + imA[i + 3] * reB[i + 3];
|
|
}
|
|
for (size_t i = end4; i < len; ++i) {
|
|
re[i] += reA[i] * reB[i] - imA[i] * imB[i];
|
|
im[i] += reA[i] * imB[i] + imA[i] * reB[i];
|
|
}
|
|
#endif
|
|
}
|
|
|
|
} // End of namespace fftconvolver
|