mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-02 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

bluez5: move spa_bt_ptp to rate-control.h

Browse source
This commit is contained in:
Pauli Virtanen 2024-02-11 00:07:59 +02:00
parent cfb29af672
commit 4f91f0bcb0
2 changed files with 51 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

49
spa/plugins/bluez5/decode-buffer.h
View file

@ -55,21 +55,6 @@
SPA_CLAMP((spike)*3/2, (packet_size), (max_buf) - 2*(packet_size)) SPA_CLAMP((spike)*3/2, (packet_size), (max_buf) - 2*(packet_size))
/** Windowed min/max */
struct spa_bt_ptp
{
union {
int32_t min;
int32_t mins[4];
};
union {
int32_t max;
int32_t maxs[4];
};
uint32_t pos;
uint32_t period;
};
struct spa_bt_decode_buffer struct spa_bt_decode_buffer
{ {
struct spa_log *log; struct spa_log *log;
@ -102,40 +87,6 @@ struct spa_bt_decode_buffer
uint8_t buffering:1; uint8_t buffering:1;
}; };
static void spa_bt_ptp_init(struct spa_bt_ptp *p, int32_t period)
{
size_t i;
spa_zero(*p);
for (i = 0; i < SPA_N_ELEMENTS(p->mins); ++i) {
p->mins[i] = INT32_MAX;
p->maxs[i] = INT32_MIN;
}
p->period = period;
}
static void spa_bt_ptp_update(struct spa_bt_ptp *p, int32_t value, uint32_t duration)
{
const size_t n = SPA_N_ELEMENTS(p->mins);
size_t i;
for (i = 0; i < n; ++i) {
p->mins[i] = SPA_MIN(p->mins[i], value);
p->maxs[i] = SPA_MAX(p->maxs[i], value);
}
p->pos += duration;
if (p->pos >= p->period / (n - 1)) {
p->pos = 0;
for (i = 1; i < SPA_N_ELEMENTS(p->mins); ++i) {
p->mins[i-1] = p->mins[i];
p->maxs[i-1] = p->maxs[i];
}
p->mins[n-1] = INT32_MAX;
p->maxs[n-1] = INT32_MIN;
}
}
static int spa_bt_decode_buffer_init(struct spa_bt_decode_buffer *this, struct spa_log *log, static int spa_bt_decode_buffer_init(struct spa_bt_decode_buffer *this, struct spa_log *log,
uint32_t frame_size, uint32_t rate, uint32_t quantum_limit, uint32_t reserve) uint32_t frame_size, uint32_t rate, uint32_t quantum_limit, uint32_t reserve)
{ {

53
spa/plugins/bluez5/rate-control.h
View file

@ -7,6 +7,55 @@
#include <spa/utils/defs.h> #include <spa/utils/defs.h>
/** Windowed min/max */
struct spa_bt_ptp
{
union {
int32_t min;
int32_t mins[4];
};
union {
int32_t max;
int32_t maxs[4];
};
uint32_t pos;
uint32_t period;
};
static inline void spa_bt_ptp_init(struct spa_bt_ptp *p, int32_t period)
{
size_t i;
spa_zero(*p);
for (i = 0; i < SPA_N_ELEMENTS(p->mins); ++i) {
p->mins[i] = INT32_MAX;
p->maxs[i] = INT32_MIN;
}
p->period = period;
}
static inline void spa_bt_ptp_update(struct spa_bt_ptp *p, int32_t value, uint32_t duration)
{
const size_t n = SPA_N_ELEMENTS(p->mins);
size_t i;
for (i = 0; i < n; ++i) {
p->mins[i] = SPA_MIN(p->mins[i], value);
p->maxs[i] = SPA_MAX(p->maxs[i], value);
}
p->pos += duration;
if (p->pos >= p->period / (n - 1)) {
p->pos = 0;
for (i = 1; i < SPA_N_ELEMENTS(p->mins); ++i) {
p->mins[i-1] = p->mins[i];
p->maxs[i-1] = p->maxs[i];
}
p->mins[n-1] = INT32_MAX;
p->maxs[n-1] = INT32_MIN;
}
}
/** /**
* Rate controller. * Rate controller.
* *
@ -98,13 +147,13 @@ struct spa_bt_rate_control
double corr; double corr;
}; };
static void spa_bt_rate_control_init(struct spa_bt_rate_control *this, double level) static inline void spa_bt_rate_control_init(struct spa_bt_rate_control *this, double level)
{ {
this->avg = level; this->avg = level;
this->corr = 1.0; this->corr = 1.0;
} }
static double spa_bt_rate_control_update(struct spa_bt_rate_control *this, double level, static inline double spa_bt_rate_control_update(struct spa_bt_rate_control *this, double level,
double target, double duration, double period, double rate_diff_max) double target, double duration, double period, double rate_diff_max)
{ {
/* /*