mirror of
https://gitlab.freedesktop.org/pipewire/pipewire.git
synced 2025-10-31 22:25:38 -04:00
seq: track port latency
This commit is contained in:
Wim Taymans
parent
4c09eb227f
commit
f03f1926e3
2 changed files with 47 additions and 31 deletions
|
|
@ -399,6 +399,8 @@ static void free_port(struct seq_state *state, struct seq_stream *stream, struct
|
|||
static void init_port(struct seq_state *state, struct seq_port *port, const snd_seq_addr_t *addr,
|
||||
unsigned int caps)
|
||||
{
|
||||
enum spa_direction reverse = SPA_DIRECTION_REVERSE(port->direction);
|
||||
|
||||
port->addr = *addr;
|
||||
port->info_all = SPA_PORT_CHANGE_MASK_FLAGS |
|
||||
SPA_PORT_CHANGE_MASK_PROPS |
|
||||
|
|
@ -407,19 +409,24 @@ static void init_port(struct seq_state *state, struct seq_port *port, const snd_
|
|||
port->info.flags = SPA_PORT_FLAG_LIVE;
|
||||
if (caps & (SND_SEQ_PORT_TYPE_HARDWARE|SND_SEQ_PORT_TYPE_PORT|SND_SEQ_PORT_TYPE_SPECIFIC))
|
||||
port->info.flags |= SPA_PORT_FLAG_PHYSICAL | SPA_PORT_FLAG_TERMINAL;
|
||||
port->params[IDX_EnumFormat] = SPA_PARAM_INFO(SPA_PARAM_EnumFormat, SPA_PARAM_INFO_READ);
|
||||
port->params[IDX_Meta] = SPA_PARAM_INFO(SPA_PARAM_Meta, SPA_PARAM_INFO_READ);
|
||||
port->params[IDX_IO] = SPA_PARAM_INFO(SPA_PARAM_IO, SPA_PARAM_INFO_READ);
|
||||
port->params[IDX_Format] = SPA_PARAM_INFO(SPA_PARAM_Format, SPA_PARAM_INFO_WRITE);
|
||||
port->params[IDX_Buffers] = SPA_PARAM_INFO(SPA_PARAM_Buffers, 0);
|
||||
port->params[IDX_Latency] = SPA_PARAM_INFO(SPA_PARAM_Latency, SPA_PARAM_INFO_READWRITE);
|
||||
|
||||
port->params[PORT_EnumFormat] = SPA_PARAM_INFO(SPA_PARAM_EnumFormat, SPA_PARAM_INFO_READ);
|
||||
port->params[PORT_Meta] = SPA_PARAM_INFO(SPA_PARAM_Meta, SPA_PARAM_INFO_READ);
|
||||
port->params[PORT_IO] = SPA_PARAM_INFO(SPA_PARAM_IO, SPA_PARAM_INFO_READ);
|
||||
port->params[PORT_Format] = SPA_PARAM_INFO(SPA_PARAM_Format, SPA_PARAM_INFO_WRITE);
|
||||
port->params[PORT_Buffers] = SPA_PARAM_INFO(SPA_PARAM_Buffers, 0);
|
||||
port->params[PORT_Latency] = SPA_PARAM_INFO(SPA_PARAM_Latency, SPA_PARAM_INFO_READWRITE);
|
||||
port->info.params = port->params;
|
||||
port->info.n_params = N_PORT_PARAMS;
|
||||
|
||||
spa_list_init(&port->free);
|
||||
spa_list_init(&port->ready);
|
||||
|
||||
port->latency[port->direction] = SPA_LATENCY_INFO(
|
||||
port->direction,
|
||||
.min_quantum = 1.0f,
|
||||
.max_quantum = 1.0f);
|
||||
port->latency[reverse] = SPA_LATENCY_INFO(reverse);
|
||||
|
||||
spa_alsa_seq_activate_port(state, port, true);
|
||||
|
||||
emit_port_info(state, port, true);
|
||||
|
|
@ -578,14 +585,9 @@ impl_node_port_enum_params(void *object, int seq,
|
|||
|
||||
case SPA_PARAM_Latency:
|
||||
switch (result.index) {
|
||||
case 0:
|
||||
{
|
||||
struct spa_latency_info info = {
|
||||
.direction = direction,
|
||||
.min_quantum = 1.0f, .max_quantum = 1.0f };
|
||||
param = spa_latency_build(&b, id, &info);
|
||||
case 0: case 1:
|
||||
param = spa_latency_build(&b, id, &port->latency[result.index]);
|
||||
break;
|
||||
}
|
||||
default:
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -646,11 +648,11 @@ static int port_set_format(void *object, struct seq_port *port,
|
|||
port->info.rate = SPA_FRACTION(1, 1);
|
||||
port->info.change_mask |= SPA_PORT_CHANGE_MASK_PARAMS;
|
||||
if (port->have_format) {
|
||||
port->params[IDX_Format] = SPA_PARAM_INFO(SPA_PARAM_Format, SPA_PARAM_INFO_READWRITE);
|
||||
port->params[IDX_Buffers] = SPA_PARAM_INFO(SPA_PARAM_Buffers, SPA_PARAM_INFO_READ);
|
||||
port->params[PORT_Format] = SPA_PARAM_INFO(SPA_PARAM_Format, SPA_PARAM_INFO_READWRITE);
|
||||
port->params[PORT_Buffers] = SPA_PARAM_INFO(SPA_PARAM_Buffers, SPA_PARAM_INFO_READ);
|
||||
} else {
|
||||
port->params[IDX_Format] = SPA_PARAM_INFO(SPA_PARAM_Format, SPA_PARAM_INFO_WRITE);
|
||||
port->params[IDX_Buffers] = SPA_PARAM_INFO(SPA_PARAM_Buffers, 0);
|
||||
port->params[PORT_Format] = SPA_PARAM_INFO(SPA_PARAM_Format, SPA_PARAM_INFO_WRITE);
|
||||
port->params[PORT_Buffers] = SPA_PARAM_INFO(SPA_PARAM_Buffers, 0);
|
||||
}
|
||||
emit_port_info(this, port, false);
|
||||
|
||||
|
|
@ -678,8 +680,19 @@ impl_node_port_set_param(void *object,
|
|||
res = port_set_format(this, port, flags, param);
|
||||
break;
|
||||
case SPA_PARAM_Latency:
|
||||
res = 0;
|
||||
{
|
||||
struct spa_latency_info info;
|
||||
if ((res = spa_latency_parse(param, &info)) < 0)
|
||||
return res;
|
||||
if (direction == info.direction)
|
||||
return -EINVAL;
|
||||
|
||||
port->latency[info.direction] = info;
|
||||
port->info.change_mask |= SPA_PORT_CHANGE_MASK_PARAMS;
|
||||
port->params[PORT_Latency].flags ^= SPA_PARAM_INFO_SERIAL;
|
||||
emit_port_info(this, port, false);
|
||||
break;
|
||||
}
|
||||
default:
|
||||
res = -ENOENT;
|
||||
break;
|
||||
|
|
@ -891,9 +904,9 @@ impl_init(const struct spa_handle_factory *factory,
|
|||
this->info.max_input_ports = MAX_PORTS;
|
||||
this->info.max_output_ports = MAX_PORTS;
|
||||
this->info.flags = SPA_NODE_FLAG_RT;
|
||||
this->params[IDX_PropInfo] = SPA_PARAM_INFO(SPA_PARAM_PropInfo, SPA_PARAM_INFO_READ);
|
||||
this->params[IDX_Props] = SPA_PARAM_INFO(SPA_PARAM_Props, SPA_PARAM_INFO_READWRITE);
|
||||
this->params[IDX_NODE_IO] = SPA_PARAM_INFO(SPA_PARAM_IO, SPA_PARAM_INFO_READ);
|
||||
this->params[NODE_PropInfo] = SPA_PARAM_INFO(SPA_PARAM_PropInfo, SPA_PARAM_INFO_READ);
|
||||
this->params[NODE_Props] = SPA_PARAM_INFO(SPA_PARAM_Props, SPA_PARAM_INFO_READWRITE);
|
||||
this->params[NODE_IO] = SPA_PARAM_INFO(SPA_PARAM_IO, SPA_PARAM_INFO_READ);
|
||||
this->info.params = this->params;
|
||||
this->info.n_params = N_NODE_PARAMS;
|
||||
reset_props(&this->props);
|
||||
|
|
|
|||
|
|
@ -44,6 +44,7 @@ extern "C" {
|
|||
#include <spa/node/io.h>
|
||||
#include <spa/param/param.h>
|
||||
#include <spa/param/audio/format-utils.h>
|
||||
#include <spa/param/latency-utils.h>
|
||||
|
||||
#include "dll.h"
|
||||
|
||||
|
|
@ -71,12 +72,12 @@ struct seq_port {
|
|||
|
||||
uint64_t info_all;
|
||||
struct spa_port_info info;
|
||||
#define IDX_EnumFormat 0
|
||||
#define IDX_Meta 1
|
||||
#define IDX_IO 2
|
||||
#define IDX_Format 3
|
||||
#define IDX_Buffers 4
|
||||
#define IDX_Latency 5
|
||||
#define PORT_EnumFormat 0
|
||||
#define PORT_Meta 1
|
||||
#define PORT_IO 2
|
||||
#define PORT_Format 3
|
||||
#define PORT_Buffers 4
|
||||
#define PORT_Latency 5
|
||||
#define N_PORT_PARAMS 6
|
||||
struct spa_param_info params[N_PORT_PARAMS];
|
||||
|
||||
|
|
@ -96,6 +97,8 @@ struct seq_port {
|
|||
unsigned int have_format:1;
|
||||
unsigned int valid:1;
|
||||
unsigned int active:1;
|
||||
|
||||
struct spa_latency_info latency[2];
|
||||
};
|
||||
|
||||
struct seq_stream {
|
||||
|
|
@ -135,9 +138,9 @@ struct seq_state {
|
|||
|
||||
uint64_t info_all;
|
||||
struct spa_node_info info;
|
||||
#define IDX_PropInfo 0
|
||||
#define IDX_Props 1
|
||||
#define IDX_NODE_IO 2
|
||||
#define NODE_PropInfo 0
|
||||
#define NODE_Props 1
|
||||
#define NODE_IO 2
|
||||
#define N_NODE_PARAMS 3
|
||||
struct spa_param_info params[N_NODE_PARAMS];
|
||||
struct props props;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue