mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-31 22:25:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

spa: mode dll to utils

Browse source
This commit is contained in:
Wim Taymans 2022-03-30 17:22:26 +02:00
parent 42d689edf2
commit 1bf1497855
6 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
spa/plugins/alsa/alsa-pcm.h
View file

@ -39,6 +39,7 @@ extern "C" {
#include <spa/support/loop.h>
#include <spa/utils/list.h>
#include <spa/utils/json.h>
#include <spa/utils/dll.h>
#include <spa/node/node.h>
#include <spa/node/utils.h>
@ -50,7 +51,6 @@ extern "C" {
#include "alsa.h"
#include "dll.h"
#define MAX_RATES 16

1
spa/plugins/alsa/alsa-seq.c
View file

@ -39,7 +39,6 @@
#include "alsa.h"
#include "dll.h"
#include "alsa-seq.h"
#define CHECK(s,msg,...) if ((res = (s)) < 0) { spa_log_error(state->log, msg ": %s", ##__VA_ARGS__, snd_strerror(res)); return res; }

2
spa/plugins/alsa/alsa-seq.h
View file

@ -37,6 +37,7 @@ extern "C" {
#include <spa/support/plugin.h>
#include <spa/support/loop.h>
#include <spa/utils/list.h>
#include <spa/utils/dll.h>
#include <spa/node/node.h>
#include <spa/node/utils.h>
@ -47,7 +48,6 @@ extern "C" {
#include "alsa.h"
#include "dll.h"
struct props {
char device[64];

71
spa/plugins/alsa/dll.h
View file

@ -1,71 +0,0 @@
/* Simple DLL
*
* Copyright © 2019 Wim Taymans
*
* 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 (including the next
* paragraph) 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.
*/
#ifndef SPA_DLL_H
#define SPA_DLL_H
#ifdef __cplusplus
extern "C" {
#endif
#include <stddef.h>
#include <math.h>
#define SPA_DLL_BW_MAX 0.128
#define SPA_DLL_BW_MIN 0.016
struct spa_dll {
double bw;
double z1, z2, z3;
double w0, w1, w2;
};
static inline void spa_dll_init(struct spa_dll *dll)
{
dll->bw = 0.0;
dll->z1 = dll->z2 = dll->z3 = 0.0;
}
static inline void spa_dll_set_bw(struct spa_dll *dll, double bw, uint32_t period, uint32_t rate)
{
double w = 2 * M_PI * bw * period / rate;
dll->w0 = 1.0 - exp (-20.0 * w);
dll->w1 = w * 1.5 / period;
dll->w2 = w / 1.5;
dll->bw = bw;
}
static inline double spa_dll_update(struct spa_dll *dll, double err)
{
dll->z1 += dll->w0 * (dll->w1 * err - dll->z1);
dll->z2 += dll->w0 * (dll->z1 - dll->z2);
dll->z3 += dll->w2 * dll->z2;
return 1.0 - (dll->z2 + dll->z3);
}
#ifdef __cplusplus
} /* extern "C" */
#endif
#endif /* SPA_DLL_H */

2
spa/plugins/alsa/meson.build
View file

@ -37,7 +37,7 @@ executable('spa-acp-tool',
executable('test-timer',
[ 'test-timer.c' ],
dependencies : [ alsa_dep, mathlib, epoll_shim_dep ],
dependencies : [ spa_dep, alsa_dep, mathlib, epoll_shim_dep ],
install : false,
)

2
spa/plugins/alsa/test-timer.c
View file

@ -31,7 +31,7 @@
#include <alsa/asoundlib.h>
#include <dll.h>
#include <spa/utils/dll.h>
#define DEFAULT_DEVICE "hw:0"