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

audioconvert: add delay_frac to spa_io_rate_match

Browse source 
Report the "fractional" part of the resampler delay in
spa_io_rate_match::delay_frac, in nanosamples (1/1e9 sample) at node
rate.

The delay values are best reported in units where it is clear what the
clock domain is, so report the value in fractional samples instead of
nanoseconds. Conversion to ns is also just dividision by the appropriate
rate.
This commit is contained in:
Pauli Virtanen 2025-01-14 21:53:55 +02:00
parent f3a9ebd569
commit 5f21ee8669
2 changed files with 51 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
spa/plugins/audioconvert/audioconvert.c
View file

@ -2162,23 +2162,30 @@ static int ensure_tmp(struct impl *this, uint32_t maxsize, uint32_t maxports)
static uint32_t resample_update_rate_match(struct impl *this, bool passthrough, uint32_t size, uint32_t queued)
{
uint32_t delay, match_size;
int32_t delay_frac;
if (passthrough) {
delay = 0;
delay_frac = 0;
match_size = size;
} else {
double rate = this->rate_scale / this->props.rate;
double fdelay;
if (this->io_rate_match &&
SPA_FLAG_IS_SET(this->io_rate_match->flags, SPA_IO_RATE_MATCH_FLAG_ACTIVE))
rate *= this->io_rate_match->rate;
resample_update_rate(&this->resample, rate);
delay = resample_delay(&this->resample);
fdelay = resample_delay(&this->resample) + resample_phase(&this->resample);
if (this->direction == SPA_DIRECTION_INPUT) {
match_size = resample_in_len(&this->resample, size);
} else {
fdelay *= rate * this->resample.o_rate / this->resample.i_rate;
match_size = resample_out_len(&this->resample, size);
delay = resample_out_len(&this->resample, delay);
}
delay = (uint32_t)round(fdelay);
delay_frac = (int32_t)((fdelay - delay) * 1e9);
}
match_size -= SPA_MIN(match_size, queued);
@ -2186,6 +2193,7 @@ static uint32_t resample_update_rate_match(struct impl *this, bool passthrough,
if (this->io_rate_match) {
this->io_rate_match->delay = delay + queued;
this->io_rate_match->delay_frac = delay_frac;
this->io_rate_match->size = match_size;
}
return match_size;