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

module-rtp-source: set custom channel names if available

Browse source 
Some AES67 devices set `i` attribute with necessary information
This commit is contained in:
Dmitry Sharshakov 2023-01-25 17:40:49 +03:00 • committed by Wim Taymans
parent cb2cc28da0
commit 62766d8175
1 changed files with 35 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/modules/module-rtp-source.c
View file

@ -25,6 +25,7 @@
#include "config.h" #include "config.h"
#include <limits.h> #include <limits.h>
#include <string.h>
#include <unistd.h> #include <unistd.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/socket.h> #include <sys/socket.h>
@ -202,6 +203,7 @@ struct sdp_info {
char origin[128]; char origin[128];
char session[256]; char session[256];
char channelmap[512];
struct sockaddr_storage sa; struct sockaddr_storage sa;
socklen_t salen; socklen_t salen;
@ -674,6 +676,11 @@ static int session_new(struct impl *impl, struct sdp_info *info)
spa_dll_init(&session->dll); spa_dll_init(&session->dll);
spa_dll_set_bw(&session->dll, SPA_DLL_BW_MIN, 128, session->info.info.rate); spa_dll_set_bw(&session->dll, SPA_DLL_BW_MIN, 128, session->info.info.rate);
if (info->channelmap[0]) {
pw_properties_set(props, PW_KEY_NODE_CHANNELNAMES, info->channelmap);
pw_log_info("channelmap: %s", info->channelmap);
}
session->stream = pw_stream_new(impl->core, session->stream = pw_stream_new(impl->core,
"rtp-source playback", props); "rtp-source playback", props);
if (session->stream == NULL) { if (session->stream == NULL) {
@ -801,6 +808,31 @@ static int parse_sdp_m(struct impl *impl, char *c, struct sdp_info *info)
return 0; return 0;
} }
// some AES67 devices have channelmap encoded in i=*
// if `i` record is found, it matches the template
// and channel count matches, name the channels respectively
// `i=2 channels: 01, 08` is the format
static int parse_sdp_i(struct impl *impl, char *c, struct sdp_info *info)
{
if (!strstr(c, " channels: ")) {
return 0;
}
c += strlen("i=");
c[strcspn(c, " ")] = '\0';
uint32_t channels;
if (sscanf(c, "%u", &channels) != 1 || channels <= 0 || channels > SPA_AUDIO_MAX_CHANNELS)
return 0;
c += strcspn(c, "\0");
c += strlen(" channels: ");
strncpy(info->channelmap, c, sizeof(info->channelmap) - 1);
return 0;
}
static int parse_sdp_a(struct impl *impl, char *c, struct sdp_info *info) static int parse_sdp_a(struct impl *impl, char *c, struct sdp_info *info)
{ {
int payload, len, rate, channels; int payload, len, rate, channels;
@ -833,6 +865,7 @@ static int parse_sdp_a(struct impl *impl, char *c, struct sdp_info *info)
if (sscanf(c, "%u/%u", &rate, &channels) == 2) { if (sscanf(c, "%u/%u", &rate, &channels) == 2) {
info->info.rate = rate; info->info.rate = rate;
info->info.channels = channels; info->info.channels = channels;
pw_log_info("rate: %d, ch: %d", rate, channels);
if (channels == 2) { if (channels == 2) {
info->info.position[0] = SPA_AUDIO_CHANNEL_FL; info->info.position[0] = SPA_AUDIO_CHANNEL_FL;
info->info.position[1] = SPA_AUDIO_CHANNEL_FR; info->info.position[1] = SPA_AUDIO_CHANNEL_FR;
@ -874,6 +907,8 @@ static int parse_sdp(struct impl *impl, char *sdp, struct sdp_info *info)
res = parse_sdp_m(impl, s, info); res = parse_sdp_m(impl, s, info);
else if (spa_strstartswith(s, "a=")) else if (spa_strstartswith(s, "a="))
res = parse_sdp_a(impl, s, info); res = parse_sdp_a(impl, s, info);
else if (spa_strstartswith(s, "i="))
res = parse_sdp_i(impl, s, info);
if (res < 0) if (res < 0)
goto error; goto error;