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

Improve rate matching and clock slaving

Browse source 
Use a new rate_match io area to exhange rate matching info between
sink/source and resampler.
Compensate for the rate match delay when scheduling timeouts.
Let the resampler notify the source of how many samples it needs to
produce the desired quantum. Make sure we keep an extra buffer in
the device to be able to make this possible.
Let the adapter directly call the slave node process function.
This commit is contained in:
Wim Taymans 2019-07-09 16:56:05 +02:00
parent 595dc0ab5b
commit c7d7058896
10 changed files with 147 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -721,6 +721,12 @@ impl_node_port_enum_params(void *object, int seq,
SPA_PARAM_IO_id, SPA_POD_Id(SPA_IO_Control),
SPA_PARAM_IO_size, SPA_POD_Int(sizeof(struct spa_io_sequence)));
break;
case 2:
param = spa_pod_builder_add_object(&b,
SPA_TYPE_OBJECT_ParamIO, id,
SPA_PARAM_IO_id, SPA_POD_Id(SPA_IO_RateMatch),
SPA_PARAM_IO_size, SPA_POD_Int(sizeof(struct spa_io_rate_match)));
break;
default:
return 0;
}
@ -850,8 +856,10 @@ impl_node_port_set_io(void *object,
spa_log_debug(this->log, "set io %d %d %d", id, direction, port_id);
switch (id) {
case SPA_IO_Control:
case SPA_IO_RateMatch:
res = spa_node_port_set_io(this->resample, direction, 0, id, data, size);
break;
case SPA_IO_Control:
res = spa_node_port_set_io(this->channelmix, direction, 0, id, data, size);
break;
default:

38
spa/plugins/audioconvert/resample.c
View file

@ -79,7 +79,6 @@ struct port {
struct spa_param_info params[8];
struct spa_io_buffers *io;
struct spa_io_sequence *io_control;
struct spa_audio_info format;
uint32_t stride;
@ -102,6 +101,7 @@ struct impl {
struct spa_cpu *cpu;
struct spa_io_position *io_position;
struct spa_io_rate_match *io_rate_match;
uint64_t info_all;
struct spa_node_info info;
@ -656,8 +656,8 @@ impl_node_port_set_io(void *object,
case SPA_IO_Buffers:
port->io = data;
break;
case SPA_IO_Control:
port->io_control = data;
case SPA_IO_RateMatch:
this->io_rate_match = data;
break;
default:
return -ENOENT;
@ -707,22 +707,6 @@ static int impl_node_port_reuse_buffer(void *object, uint32_t port_id, uint32_t
return 0;
}
static int process_control(struct impl *this, struct port *port, struct spa_pod_sequence *sequence)
{
struct spa_pod_control *c;
SPA_POD_SEQUENCE_FOREACH(sequence, c) {
switch (c->type) {
case SPA_CONTROL_Properties:
apply_props(this, (const struct spa_pod *) &c->value);
break;
default:
break;
}
}
return 0;
}
static int impl_node_process(void *object)
{
struct impl *this = object;
@ -735,6 +719,7 @@ static int impl_node_process(void *object)
const void **src_datas;
void **dst_datas;
bool flush_out = false;
bool flush_in = false;
spa_return_val_if_fail(this != NULL, -EINVAL);
@ -750,9 +735,6 @@ static int impl_node_process(void *object)
spa_log_trace_fp(this->log, NAME " %p: status %d %d %d",
this, inio->status, outio->status, inio->buffer_id);
if (outport->io_control)
process_control(this, outport, &outport->io_control->sequence);
if (outio->status == SPA_STATUS_HAVE_BUFFER)
return SPA_STATUS_HAVE_BUFFER;
@ -788,6 +770,7 @@ static int impl_node_process(void *object)
switch (this->mode) {
case MODE_SPLIT:
maxsize = SPA_MIN(maxsize, max * sizeof(float));
flush_out = flush_in = this->io_rate_match != NULL;
break;
case MODE_MERGE:
default:
@ -821,11 +804,13 @@ static int impl_node_process(void *object)
}
inport->offset += in_len * sizeof(float);
if (inport->offset >= size) {
if (inport->offset >= size || flush_in) {
inio->status = SPA_STATUS_NEED_BUFFER;
inport->offset = 0;
SPA_FLAG_SET(res, SPA_STATUS_NEED_BUFFER);
spa_log_trace_fp(this->log, NAME " %p: return input buffer", this);
}
outport->offset += out_len * sizeof(float);
if (outport->offset > 0 && (outport->offset >= maxsize || flush_out)) {
outio->status = SPA_STATUS_HAVE_BUFFER;
@ -833,6 +818,13 @@ static int impl_node_process(void *object)
dequeue_buffer(this, dbuf);
outport->offset = 0;
SPA_FLAG_SET(res, SPA_STATUS_HAVE_BUFFER);
spa_log_trace_fp(this->log, NAME " %p: have output buffer", this);
}
if (this->io_rate_match) {
resample_update_rate(&this->resample, this->io_rate_match->rate);
this->io_rate_match->delay = resample_delay(&this->resample);
this->io_rate_match->size = resample_in_len(&this->resample, max);
}
return res;
}