mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-03 09:01:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

media-session: keep track of profile format

Browse source 
Also keep track of the profile format of a node, this is the profile we
choose for it and what we should use as a profile for the peer node.
This commit is contained in:
Wim Taymans 2018-12-05 15:59:45 +01:00
parent 11a3370f12
commit 5fcbbb4d6b
1 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/examples/media-session.c
View file

@ -119,6 +119,8 @@ struct node {
uint32_t media_type; uint32_t media_type;
uint32_t media_subtype; uint32_t media_subtype;
struct spa_audio_info_raw format; struct spa_audio_info_raw format;
struct spa_audio_info_raw profile_format;
}; };
struct port { struct port {
@ -1112,10 +1114,14 @@ static int rescan_node(struct impl *impl, struct node *node)
spa_list_append(&session->node_list, &node->session_link); spa_list_append(&session->node_list, &node->session_link);
if (!exclusive && session->dsp) { if (!exclusive && session->dsp) {
audio_info = session->node->format; do_link:
audio_info.format = SPA_AUDIO_FORMAT_F32P; audio_info = peer->profile_format;
audio_info.rate = session->node->format.rate; if (direction == PW_DIRECTION_INPUT)
audio_info.channels = SPA_MIN(session->node->format.channels, node->format.channels); audio_info.channels = SPA_MIN(peer->format.channels, node->format.channels);
else
audio_info.channels = SPA_MAX(peer->format.channels, node->format.channels);
node->profile_format = audio_info;
spa_pod_builder_init(&b, buf, sizeof(buf)); spa_pod_builder_init(&b, buf, sizeof(buf));
param = spa_pod_builder_object(&b, param = spa_pod_builder_object(&b,
@ -1136,7 +1142,6 @@ static int rescan_node(struct impl *impl, struct node *node)
} else { } else {
n_links = audio_info.channels = 1; n_links = audio_info.channels = 1;
} }
do_link:
link_nodes(peer, direction, node, n_links); link_nodes(peer, direction, node, n_links);
return 1; return 1;
@ -1158,6 +1163,9 @@ static void dsp_node_event_info(void *object, struct pw_node_info *info)
dsp->direction = s->direction; dsp->direction = s->direction;
dsp->type = NODE_TYPE_DSP; dsp->type = NODE_TYPE_DSP;
dsp->manager = s; dsp->manager = s;
dsp->format = s->node->format;
dsp->profile_format = dsp->format;
dsp->profile_format.format = SPA_AUDIO_FORMAT_F32P;
} }
static const struct pw_node_proxy_events dsp_node_events = { static const struct pw_node_proxy_events dsp_node_events = {