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

alsa: Share node/port info emission code between sink and source

Browse source 
It's mostly the same, and it allows us to trigger this code in the
shared alsa-pcm.c code as well.
This commit is contained in:
Arun Raghavan 2023-11-07 13:01:52 -05:00
parent 72c9fba6d2
commit 6bae812ce0
4 changed files with 96 additions and 160 deletions
Download patch file Download diff file Expand all files Collapse all files

91
spa/plugins/alsa/alsa-pcm-sink.c
View file

@ -8,8 +8,6 @@
#include <spa/node/node.h>
#include <spa/node/utils.h>
#include <spa/node/keys.h>
#include <spa/monitor/device.h>
#include <spa/utils/keys.h>
#include <spa/utils/names.h>
#include <spa/utils/string.h>
@ -31,75 +29,6 @@ static void reset_props(struct props *props)
props->use_chmap = DEFAULT_USE_CHMAP;
}
static void emit_node_info(struct state *this, bool full)
{
uint64_t old = full ? this->info.change_mask : 0;
if (full)
this->info.change_mask = this->info_all;
if (this->info.change_mask) {
struct spa_dict_item items[7];
uint32_t i, n_items = 0;
char latency[64], period[64], nperiods[64], headroom[64];
items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_DEVICE_API, "alsa");
items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_MEDIA_CLASS, "Audio/Sink");
items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_NODE_DRIVER, "true");
if (this->have_format) {
snprintf(latency, sizeof(latency), "%lu/%d", this->buffer_frames / 2, this->rate);
items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_NODE_MAX_LATENCY, latency);
snprintf(period, sizeof(period), "%lu", this->period_frames);
items[n_items++] = SPA_DICT_ITEM_INIT("api.alsa.period-size", period);
snprintf(nperiods, sizeof(nperiods), "%lu",
this->period_frames != 0 ? this->buffer_frames / this->period_frames : 0);
items[n_items++] = SPA_DICT_ITEM_INIT("api.alsa.period-num", nperiods);
snprintf(headroom, sizeof(headroom), "%u", this->headroom);
items[n_items++] = SPA_DICT_ITEM_INIT("api.alsa.headroom", headroom);
} else {
items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_NODE_MAX_LATENCY, NULL);
items[n_items++] = SPA_DICT_ITEM_INIT("api.alsa.period-size", NULL);
items[n_items++] = SPA_DICT_ITEM_INIT("api.alsa.period-num", NULL);
items[n_items++] = SPA_DICT_ITEM_INIT("api.alsa.headroom", NULL);
}
this->info.props = &SPA_DICT_INIT(items, n_items);
if (this->info.change_mask & SPA_NODE_CHANGE_MASK_PARAMS) {
for (i = 0; i < this->info.n_params; i++) {
if (this->params[i].user > 0) {
this->params[i].flags ^= SPA_PARAM_INFO_SERIAL;
this->params[i].user = 0;
}
}
}
spa_node_emit_info(&this->hooks, &this->info);
this->info.change_mask = old;
}
}
static void emit_port_info(struct state *this, bool full)
{
uint64_t old = full ? this->port_info.change_mask : 0;
if (full)
this->port_info.change_mask = this->port_info_all;
if (this->port_info.change_mask) {
uint32_t i;
if (this->port_info.change_mask & SPA_PORT_CHANGE_MASK_PARAMS) {
for (i = 0; i < this->port_info.n_params; i++) {
if (this->port_params[i].user > 0) {
this->port_params[i].flags ^= SPA_PARAM_INFO_SERIAL;
this->port_params[i].user = 0;
}
}
}
spa_node_emit_port_info(&this->hooks,
SPA_DIRECTION_INPUT, 0, &this->port_info);
this->port_info.change_mask = old;
}
}
static int impl_node_enum_params(void *object, int seq,
uint32_t id, uint32_t start, uint32_t num,
const struct spa_pod *filter)
@ -348,8 +277,8 @@ static int impl_node_set_param(void *object, uint32_t id, uint32_t flags,
info.ns = lat_ns;
handle_process_latency(this, &info);
}
emit_node_info(this, false);
emit_port_info(this, false);
spa_alsa_emit_node_info(this, false);
spa_alsa_emit_port_info(this, false);
break;
}
case SPA_PARAM_ProcessLatency:
@ -362,8 +291,8 @@ static int impl_node_set_param(void *object, uint32_t id, uint32_t flags,
handle_process_latency(this, &info);
emit_node_info(this, false);
emit_port_info(this, false);
spa_alsa_emit_node_info(this, false);
spa_alsa_emit_port_info(this, false);
break;
}
default:
@ -425,8 +354,8 @@ impl_node_add_listener(void *object,
spa_hook_list_isolate(&this->hooks, &save, listener, events, data);
emit_node_info(this, true);
emit_port_info(this, true);
spa_alsa_emit_node_info(this, true);
spa_alsa_emit_port_info(this, true);
spa_hook_list_join(&this->hooks, &save);
@ -673,7 +602,7 @@ static int port_set_format(void *object,
}
this->info.change_mask |= SPA_NODE_CHANGE_MASK_PROPS;
emit_node_info(this, false);
spa_alsa_emit_node_info(this, false);
this->port_info.change_mask |= SPA_PORT_CHANGE_MASK_RATE;
this->port_info.rate = SPA_FRACTION(1, this->rate);
@ -686,7 +615,7 @@ static int port_set_format(void *object,
this->port_params[PORT_Format] = SPA_PARAM_INFO(SPA_PARAM_Format, SPA_PARAM_INFO_WRITE);
this->port_params[PORT_Buffers] = SPA_PARAM_INFO(SPA_PARAM_Buffers, 0);
}
emit_port_info(this, false);
spa_alsa_emit_port_info(this, false);
return err;
}
@ -722,7 +651,7 @@ impl_node_port_set_param(void *object,
this->latency[info.direction] = info;
this->port_info.change_mask |= SPA_PORT_CHANGE_MASK_PARAMS;
this->port_params[PORT_Latency].user++;
emit_port_info(this, false);
spa_alsa_emit_port_info(this, false);
break;
}
case SPA_PARAM_Tag:
@ -741,7 +670,7 @@ impl_node_port_set_param(void *object,
this->port_info.change_mask |= SPA_PORT_CHANGE_MASK_PARAMS;
this->port_params[PORT_Tag].user++;
emit_port_info(this, false);
spa_alsa_emit_port_info(this, false);
}
break;
}

89
spa/plugins/alsa/alsa-pcm-source.c
View file

@ -8,12 +8,10 @@
#include <spa/node/node.h>
#include <spa/node/utils.h>
#include <spa/node/keys.h>
#include <spa/utils/keys.h>
#include <spa/utils/names.h>
#include <spa/utils/list.h>
#include <spa/utils/string.h>
#include <spa/monitor/device.h>
#include <spa/param/audio/format.h>
#include <spa/pod/filter.h>
#include <spa/pod/dynamic.h>
@ -32,73 +30,6 @@ static void reset_props(struct props *props)
props->use_chmap = DEFAULT_USE_CHMAP;
}
static void emit_node_info(struct state *this, bool full)
{
uint64_t old = full ? this->info.change_mask : 0;
if (full)
this->info.change_mask = this->info_all;
if (this->info.change_mask) {
struct spa_dict_item items[7];
uint32_t i, n_items = 0;
char latency[64], period[64], nperiods[64], headroom[64];
items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_DEVICE_API, "alsa");
items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_MEDIA_CLASS, "Audio/Source");
items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_NODE_DRIVER, "true");
if (this->have_format) {
snprintf(latency, sizeof(latency), "%lu/%d", this->buffer_frames / 2, this->rate);
items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_NODE_MAX_LATENCY, latency);
snprintf(period, sizeof(period), "%lu", this->period_frames);
items[n_items++] = SPA_DICT_ITEM_INIT("api.alsa.period-size", period);
snprintf(nperiods, sizeof(nperiods), "%lu",
this->period_frames != 0 ? this->buffer_frames / this->period_frames : 0);
items[n_items++] = SPA_DICT_ITEM_INIT("api.alsa.period-num", nperiods);
snprintf(headroom, sizeof(headroom), "%u", this->headroom);
items[n_items++] = SPA_DICT_ITEM_INIT("api.alsa.headroom", headroom);
} else {
items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_NODE_MAX_LATENCY, NULL);
items[n_items++] = SPA_DICT_ITEM_INIT("api.alsa.period-size", NULL);
items[n_items++] = SPA_DICT_ITEM_INIT("api.alsa.period-num", NULL);
items[n_items++] = SPA_DICT_ITEM_INIT("api.alsa.headroom", NULL);
}
this->info.props = &SPA_DICT_INIT(items, n_items);
if (this->info.change_mask & SPA_NODE_CHANGE_MASK_PARAMS) {
for (i = 0; i < this->info.n_params; i++) {
if (this->params[i].user > 0) {
this->params[i].flags ^= SPA_PARAM_INFO_SERIAL;
this->params[i].user = 0;
}
}
}
spa_node_emit_info(&this->hooks, &this->info);
this->info.change_mask = old;
}
}
static void emit_port_info(struct state *this, bool full)
{
uint64_t old = full ? this->port_info.change_mask : 0;
if (full)
this->port_info.change_mask = this->port_info_all;
if (this->port_info.change_mask) {
uint32_t i;
if (this->port_info.change_mask & SPA_PORT_CHANGE_MASK_PARAMS) {
for (i = 0; i < this->port_info.n_params; i++) {
if (this->port_params[i].user > 0) {
this->port_params[i].flags ^= SPA_PARAM_INFO_SERIAL;
this->port_params[i].user = 0;
}
}
}
spa_node_emit_port_info(&this->hooks,
SPA_DIRECTION_OUTPUT, 0, &this->port_info);
this->port_info.change_mask = old;
}
}
static int impl_node_enum_params(void *object, int seq,
uint32_t id, uint32_t start, uint32_t num,
const struct spa_pod *filter)
@ -311,8 +242,8 @@ static int impl_node_set_param(void *object, uint32_t id, uint32_t flags,
handle_process_latency(this, &info);
}
emit_node_info(this, false);
emit_port_info(this, false);
spa_alsa_emit_node_info(this, false);
spa_alsa_emit_port_info(this, false);
break;
}
case SPA_PARAM_ProcessLatency:
@ -325,8 +256,8 @@ static int impl_node_set_param(void *object, uint32_t id, uint32_t flags,
handle_process_latency(this, &info);
emit_node_info(this, false);
emit_port_info(this, false);
spa_alsa_emit_node_info(this, false);
spa_alsa_emit_port_info(this, false);
break;
}
default:
@ -388,8 +319,8 @@ impl_node_add_listener(void *object,
spa_hook_list_isolate(&this->hooks, &save, listener, events, data);
emit_node_info(this, true);
emit_port_info(this, true);
spa_alsa_emit_node_info(this, true);
spa_alsa_emit_port_info(this, true);
spa_hook_list_join(&this->hooks, &save);
@ -607,7 +538,7 @@ static int port_set_format(void *object,
}
this->info.change_mask |= SPA_NODE_CHANGE_MASK_PROPS;
emit_node_info(this, false);
spa_alsa_emit_node_info(this, false);
this->port_info.change_mask |= SPA_PORT_CHANGE_MASK_RATE;
this->port_info.rate = SPA_FRACTION(1, this->rate);
@ -620,7 +551,7 @@ static int port_set_format(void *object,
this->port_params[PORT_Format] = SPA_PARAM_INFO(SPA_PARAM_Format, SPA_PARAM_INFO_WRITE);
this->port_params[PORT_Buffers] = SPA_PARAM_INFO(SPA_PARAM_Buffers, 0);
}
emit_port_info(this, false);
spa_alsa_emit_port_info(this, false);
return err;
}
@ -656,7 +587,7 @@ impl_node_port_set_param(void *object,
this->latency[info.direction] = info;
this->port_info.change_mask |= SPA_PORT_CHANGE_MASK_PARAMS;
this->port_params[PORT_Latency].user++;
emit_port_info(this, false);
spa_alsa_emit_port_info(this, false);
break;
}
case SPA_PARAM_Tag:
@ -675,7 +606,7 @@ impl_node_port_set_param(void *object,
this->port_info.change_mask |= SPA_PORT_CHANGE_MASK_PARAMS;
this->port_params[PORT_Tag].user++;
emit_port_info(this, false);
spa_alsa_emit_port_info(this, false);
}
break;
}

73
spa/plugins/alsa/alsa-pcm.c
View file

@ -13,6 +13,8 @@
#include <spa/utils/result.h>
#include <spa/support/system.h>
#include <spa/utils/keys.h>
#include <spa/node/keys.h>
#include <spa/monitor/device.h>
#include "alsa-pcm.h"
@ -3226,3 +3228,74 @@ int spa_alsa_pause(struct state *state)
return 0;
}
void spa_alsa_emit_node_info(struct state *state, bool full)
{
uint64_t old = full ? state->info.change_mask : 0;
if (full)
state->info.change_mask = state->info_all;
if (state->info.change_mask) {
struct spa_dict_item items[7];
uint32_t i, n_items = 0;
char latency[64], period[64], nperiods[64], headroom[64];
items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_DEVICE_API, "alsa");
items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_MEDIA_CLASS,
state->stream == SND_PCM_STREAM_PLAYBACK ? "Audio/Sink" : "Audio/Source");
items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_NODE_DRIVER, "true");
if (state->have_format) {
snprintf(latency, sizeof(latency), "%lu/%d", state->buffer_frames / 2, state->rate);
items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_NODE_MAX_LATENCY, latency);
snprintf(period, sizeof(period), "%lu", state->period_frames);
items[n_items++] = SPA_DICT_ITEM_INIT("api.alsa.period-size", period);
snprintf(nperiods, sizeof(nperiods), "%lu",
state->period_frames != 0 ? state->buffer_frames / state->period_frames : 0);
items[n_items++] = SPA_DICT_ITEM_INIT("api.alsa.period-num", nperiods);
snprintf(headroom, sizeof(headroom), "%u", state->headroom);
items[n_items++] = SPA_DICT_ITEM_INIT("api.alsa.headroom", headroom);
} else {
items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_NODE_MAX_LATENCY, NULL);
items[n_items++] = SPA_DICT_ITEM_INIT("api.alsa.period-size", NULL);
items[n_items++] = SPA_DICT_ITEM_INIT("api.alsa.period-num", NULL);
items[n_items++] = SPA_DICT_ITEM_INIT("api.alsa.headroom", NULL);
}
state->info.props = &SPA_DICT_INIT(items, n_items);
if (state->info.change_mask & SPA_NODE_CHANGE_MASK_PARAMS) {
for (i = 0; i < state->info.n_params; i++) {
if (state->params[i].user > 0) {
state->params[i].flags ^= SPA_PARAM_INFO_SERIAL;
state->params[i].user = 0;
}
}
}
spa_node_emit_info(&state->hooks, &state->info);
state->info.change_mask = old;
}
}
void spa_alsa_emit_port_info(struct state *state, bool full)
{
uint64_t old = full ? state->port_info.change_mask : 0;
if (full)
state->port_info.change_mask = state->port_info_all;
if (state->port_info.change_mask) {
uint32_t i;
if (state->port_info.change_mask & SPA_PORT_CHANGE_MASK_PARAMS) {
for (i = 0; i < state->port_info.n_params; i++) {
if (state->port_params[i].user > 0) {
state->port_params[i].flags ^= SPA_PARAM_INFO_SERIAL;
state->port_params[i].user = 0;
}
}
}
spa_node_emit_port_info(&state->hooks,
state->stream == SND_PCM_STREAM_PLAYBACK ? SPA_DIRECTION_INPUT : SPA_DIRECTION_OUTPUT,
0, &state->port_info);
state->port_info.change_mask = old;
}
}

3
spa/plugins/alsa/alsa-pcm.h
View file

@ -282,6 +282,9 @@ int spa_alsa_skip(struct state *state);
void spa_alsa_recycle_buffer(struct state *state, uint32_t buffer_id);
void spa_alsa_emit_node_info(struct state *state, bool full);
void spa_alsa_emit_port_info(struct state *state, bool full);
static inline uint32_t spa_alsa_format_from_name(const char *name, size_t len)
{
int i;