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: improve Buffer params

Browse source 
Make sure we only make the buffer for the follower larger when we
downsample because then we need to ask for more data from the follower
to fill up a quantum.

Never try to make the follower buffer smaller than the quantum limit.
The reason is that the graph rate could be decreased dynamically and
then we would end up with too small buffers.

See #4490
This commit is contained in:
Wim Taymans 2025-01-09 11:30:02 +01:00
parent feaa36560d
commit 48416b32ad
1 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2527,29 +2527,30 @@ impl_node_port_enum_params(void *object, int seq,
if (result.index > 0)
return 0;
if (PORT_IS_DSP(this, direction, port_id)) {
/* DSP ports always use the quantum_limit as the buffer
* size. */
size = this->quantum_limit;
} else {
size = this->quantum_limit;
if (!PORT_IS_DSP(this, direction, port_id)) {
uint32_t irate, orate;
struct dir *dir = &this->dir[direction];
/* Convert ports are scaled so that they can always
* provide one quantum of data */
* provide one quantum of data. irate is the rate of the
* data before it goes into the resampler. */
irate = dir->format.info.raw.rate;
/* scale the size for adaptive resampling */
size += size/2;
/* collect the other port rate */
/* collect the other port rate. This is the output of the resampler
* and is usually one quantum. */
dir = &this->dir[SPA_DIRECTION_REVERSE(direction)];
if (dir->mode == SPA_PARAM_PORT_CONFIG_MODE_dsp)
orate = this->io_position ? this->io_position->clock.target_rate.denom : DEFAULT_RATE;
orate = this->io_position ? this->io_position->clock.target_rate.denom : DEFAULT_RATE;
else
orate = dir->format.info.raw.rate;
/* always keep some extra room for adaptive resampling */
size = this->quantum_limit * 2;
/* scale the buffer size when we can. */
if (irate != 0 && orate != 0)
/* scale the buffer size when we can. Only do this when we downsample because
* then we need to ask more input data for one quantum. */
if (irate != 0 && orate != 0 && irate > orate)
size = SPA_SCALE32_UP(size, irate, orate);
}