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: also place resample output in rate_io

Browse source 
We can also place the estimated size that the resampler will produce in
the rate_io for output streams.

See #3750
This commit is contained in:
Wim Taymans 2024-01-16 13:29:57 +01:00
parent 13d4bb4b42
commit 010c9f1b93
1 changed files with 60 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1826,6 +1826,52 @@ static int ensure_tmp(struct impl *this, uint32_t maxsize, uint32_t maxports)
return 0; return 0;
} }
static uint32_t resample_update_rate_match(struct impl *this, bool passthrough, uint32_t size, uint32_t queued)
{
uint32_t delay, match_size;
if (passthrough) {
delay = 0;
match_size = 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;
resample_update_rate(&this->resample, rate);
delay = resample_delay(&this->resample);
if (this->direction == SPA_DIRECTION_INPUT)
match_size = resample_in_len(&this->resample, size);
else
match_size = resample_out_len(&this->resample, size);
}
match_size -= SPA_MIN(match_size, queued);
spa_log_trace_fp(this->log, "%p: next match %u", this, match_size);
if (this->io_rate_match) {
this->io_rate_match->delay = delay + queued;
this->io_rate_match->size = match_size;
}
return match_size;
}
static inline bool resample_is_passthrough(struct impl *this)
{
if (this->props.resample_disabled)
return true;
if (this->resample.i_rate != this->resample.o_rate)
return false;
if (this->rate_scale != 1.0)
return false;
if (this->rate_adjust)
return false;
if (this->io_rate_match != NULL &&
SPA_FLAG_IS_SET(this->io_rate_match->flags, SPA_IO_RATE_MATCH_FLAG_ACTIVE))
return false;
return true;
}
static int setup_convert(struct impl *this) static int setup_convert(struct impl *this)
{ {
struct dir *in, *out; struct dir *in, *out;
@ -2765,49 +2811,6 @@ static inline uint32_t resample_get_in_size(struct impl *this, bool passthrough,
return 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)
{
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;
resample_update_rate(&this->resample, rate);
delay = resample_delay(&this->resample);
match_size = resample_in_len(&this->resample, out_size);
}
match_size -= SPA_MIN(match_size, in_queued);
spa_log_trace_fp(this->log, "%p: next match %u", this, match_size);
if (this->io_rate_match) {
this->io_rate_match->delay = delay + in_queued;
this->io_rate_match->size = match_size;
}
return match_size;
}
static inline bool resample_is_passthrough(struct impl *this)
{
if (this->props.resample_disabled)
return true;
if (this->resample.i_rate != this->resample.o_rate)
return false;
if (this->rate_scale != 1.0)
return false;
if (this->rate_adjust)
return false;
if (this->io_rate_match != NULL &&
SPA_FLAG_IS_SET(this->io_rate_match->flags, SPA_IO_RATE_MATCH_FLAG_ACTIVE))
return false;
return true;
}
static uint64_t get_time_ns(struct impl *impl) static uint64_t get_time_ns(struct impl *impl)
{ {
struct timespec now; struct timespec now;
@ -3272,10 +3275,20 @@ static int impl_node_process(void *object)
spa_log_trace_fp(this->log, "%p: no output buffer", this); spa_log_trace_fp(this->log, "%p: no output buffer", this);
} }
} }
{
uint32_t size, queued;
if (this->direction == SPA_DIRECTION_INPUT) {
size = max_out - this->out_offset;
queued = max_in - this->in_offset;
} else {
size = quant_samples;
queued = 0;
}
if (resample_update_rate_match(this, resample_passthrough, if (resample_update_rate_match(this, resample_passthrough,
max_out - this->out_offset, size, queued) > 0)
max_in - this->in_offset) > 0)
res |= SPA_STATUS_NEED_DATA; res |= SPA_STATUS_NEED_DATA;
}
return res; return res;
} }