mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-29 05:40:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

audioconvert: fix rate match for sources

Browse source 
Only update the resampler rate when we ask for more data, when we have
more input data, use the previously configured rate to calculate how
many samples we will consume.

Fixes resync errors with multiple sources. One source would do rate
matching, audioconvert would ask it to produce X samples, the source is
scheduled to produce the samples, the rate match is updated with the new
rate correction, audioconvert is scheduled again. It should now use the
X samples it asked to produce and apply the new rate correction for the
next iteration.
This commit is contained in:
Wim Taymans 2022-08-30 12:43:14 +02:00
parent c0e8b397f6
commit e04e3ef40e
1 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2226,15 +2226,22 @@ static int channelmix_process_control(struct impl *this, struct port *ctrlport,
return end ? 1 : 0;
}
static uint32_t resample_get_in_size(struct impl *this, bool passthrough, uint32_t out_size)
{
uint32_t match_size = passthrough ? out_size : resample_in_len(&this->resample, out_size);
spa_log_trace_fp(this->log, "%p: current match %u", this, match_size);
return match_size;
}
static uint32_t resample_update_rate_match(struct impl *this, bool passthrough, uint32_t out_size, uint32_t in_queued)
{
double rate = this->rate_scale / this->props.rate;
uint32_t delay, match_size;
if (passthrough) {
delay = 0;
match_size = out_size;
} else {
double rate = this->rate_scale / this->props.rate;
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;
@ -2503,16 +2510,16 @@ static int impl_node_process(void *object)
/* calculate how many samples we are going to consume. */
if (this->direction == SPA_DIRECTION_INPUT) {
uint32_t n_in;
/* then figure out how much input samples we need to consume */
n_in = resample_update_rate_match(this, resample_passthrough, n_out, 0);
if (!in_avail || this->drained) {
/* no input, ask for more, update rate-match first */
resample_update_rate_match(this, resample_passthrough, n_out, 0);
spa_log_trace_fp(this->log, "%p: no input drained:%d", this, this->drained);
/* no input, ask for more */
res |= this->drained ? SPA_STATUS_DRAINED : SPA_STATUS_NEED_DATA;
return res;
}
n_samples = SPA_MIN(n_samples, n_in);
/* else figure out how much input samples we need to consume */
n_samples = SPA_MIN(n_samples,
resample_get_in_size(this, resample_passthrough, n_out));
} else {
/* in merge mode we consume one duration of samples */
n_samples = SPA_MIN(n_samples, quant_samples);