mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-12-17 08:56:49 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

module-rtp: Add rtp-midi support

Browse source 
Add rtp-midi support with the media.type = midi option
This commit is contained in:
Wim Taymans 2023-02-16 09:52:04 +01:00
parent 934ab3036e
commit fbd068977c
3 changed files with 675 additions and 159 deletions
Download patch file Download diff file Expand all files Collapse all files

381
src/modules/module-rtp-sink.c
View file

@ -52,6 +52,7 @@
* - `sess.name = <str>`: a session name * - `sess.name = <str>`: a session name
* - `sess.ts-offset = <int>`: an offset to apply to the timestamp, default -1 = random offset * - `sess.ts-offset = <int>`: an offset to apply to the timestamp, default -1 = random offset
* - `sess.ts-refclk = <string>`: the name of a reference clock * - `sess.ts-refclk = <string>`: the name of a reference clock
* - `media.type = <string>`: the media type audio|midi, default audio
* - `stream.props = {}`: properties to be passed to the stream * - `stream.props = {}`: properties to be passed to the stream
* *
* ## General options * ## General options
@ -157,26 +158,6 @@ static const struct spa_dict_item module_info[] = {
{ PW_KEY_MODULE_VERSION, PACKAGE_VERSION }, { PW_KEY_MODULE_VERSION, PACKAGE_VERSION },
}; };
static const struct format_info {
uint32_t format;
uint32_t size;
const char *mime;
} format_info[] = {
{ SPA_AUDIO_FORMAT_U8, 1, "L8" },
{ SPA_AUDIO_FORMAT_ALAW, 1, "PCMA" },
{ SPA_AUDIO_FORMAT_ULAW, 1, "PCMU" },
{ SPA_AUDIO_FORMAT_S16_BE, 2, "L16" },
{ SPA_AUDIO_FORMAT_S24_BE, 3, "L24" },
};
static const struct format_info *find_format_info(uint32_t format)
{
SPA_FOR_EACH_ELEMENT_VAR(format_info, f)
if (f->format == format)
return f;
return NULL;
}
struct impl { struct impl {
struct pw_impl_module *module; struct pw_impl_module *module;
struct spa_hook module_listener; struct spa_hook module_listener;
@ -201,13 +182,14 @@ struct impl {
char *ifname; char *ifname;
char *session_name; char *session_name;
int sess_latency_msec; uint32_t mtu;
int mtu;
bool ttl; bool ttl;
bool mcast_loop; bool mcast_loop;
float min_ptime; float min_ptime;
float max_ptime; float max_ptime;
uint32_t psamples; uint32_t psamples;
uint32_t min_samples;
uint32_t max_samples;
struct sockaddr_storage src_addr; struct sockaddr_storage src_addr;
socklen_t src_len; socklen_t src_len;
@ -223,8 +205,9 @@ struct impl {
uint16_t msg_id_hash; uint16_t msg_id_hash;
uint32_t ntp; uint32_t ntp;
struct spa_audio_info_raw info; struct spa_audio_info info;
const struct format_info *format_info; const struct format_info *format_info;
uint32_t rate;
uint32_t stride; uint32_t stride;
int payload; int payload;
uint16_t seq; uint16_t seq;
@ -239,6 +222,7 @@ struct impl {
int sap_fd; int sap_fd;
unsigned sync:1; unsigned sync:1;
unsigned has_sent_sap:1;
}; };
@ -259,13 +243,58 @@ set_iovec(struct spa_ringbuffer *rbuf, void *buffer, uint32_t size,
iov[1].iov_base = buffer; iov[1].iov_base = buffer;
} }
static void flush_packets(struct impl *impl) struct format_info {
uint32_t media_subtype;
uint32_t format;
uint32_t size;
const char *mime;
const char *media_type;
};
static const struct format_info audio_format_info[] = {
{ SPA_MEDIA_SUBTYPE_raw, SPA_AUDIO_FORMAT_U8, 1, "L8", "audio" },
{ SPA_MEDIA_SUBTYPE_raw, SPA_AUDIO_FORMAT_ALAW, 1, "PCMA", "audio" },
{ SPA_MEDIA_SUBTYPE_raw, SPA_AUDIO_FORMAT_ULAW, 1, "PCMU", "audio" },
{ SPA_MEDIA_SUBTYPE_raw, SPA_AUDIO_FORMAT_S16_BE, 2, "L16", "audio" },
{ SPA_MEDIA_SUBTYPE_raw, SPA_AUDIO_FORMAT_S24_BE, 3, "L24", "audio" },
{ SPA_MEDIA_SUBTYPE_control, 0, 1, "rtp-midi", "audio" },
};
static const struct format_info *find_audio_format_info(const struct spa_audio_info *info)
{
SPA_FOR_EACH_ELEMENT_VAR(audio_format_info, f)
if (f->media_subtype == info->media_subtype &&
(f->format == 0 || f->format == info->info.raw.format))
return f;
return NULL;
}
static ssize_t send_packet(struct impl *impl, struct msghdr *msg)
{
ssize_t n;
n = sendmsg(impl->rtp_fd, msg, MSG_NOSIGNAL);
if (n < 0) {
switch (errno) {
case ECONNREFUSED:
case ECONNRESET:
pw_log_debug("remote end not listening");
break;
default:
pw_log_warn("sendmsg() failed, seq:%u dropped: %m",
impl->seq);
break;
}
}
impl->seq++;
return n;
}
static void flush_audio_packets(struct impl *impl)
{ {
int32_t avail; int32_t avail;
uint32_t stride, timestamp; uint32_t stride, timestamp;
struct iovec iov[3]; struct iovec iov[3];
struct msghdr msg; struct msghdr msg;
ssize_t n;
struct rtp_header header; struct rtp_header header;
int32_t tosend; int32_t tosend;
@ -303,21 +332,8 @@ static void flush_packets(struct impl *impl)
&iov[1], tosend * stride); &iov[1], tosend * stride);
pw_log_trace("sending %d timestamp:%d", tosend, timestamp); pw_log_trace("sending %d timestamp:%d", tosend, timestamp);
n = sendmsg(impl->rtp_fd, &msg, MSG_NOSIGNAL);
if (n < 0) {
switch (errno) {
case ECONNREFUSED:
case ECONNRESET:
pw_log_debug("remote end not listening");
break;
default:
pw_log_warn("sendmsg() failed, seq:%u dropped: %m",
impl->seq);
break;
}
}
impl->seq++; send_packet(impl, &msg);
timestamp += tosend; timestamp += tosend;
avail -= tosend; avail -= tosend;
@ -325,9 +341,8 @@ static void flush_packets(struct impl *impl)
spa_ringbuffer_read_update(&impl->ring, timestamp); spa_ringbuffer_read_update(&impl->ring, timestamp);
} }
static void stream_process(void *data) static void stream_audio_process(struct impl *impl)
{ {
struct impl *impl = data;
struct pw_buffer *buf; struct pw_buffer *buf;
struct spa_data *d; struct spa_data *d;
uint32_t offs, size, timestamp, expected_timestamp, stride; uint32_t offs, size, timestamp, expected_timestamp, stride;
@ -376,9 +391,168 @@ static void stream_process(void *data)
pw_stream_queue_buffer(impl->stream, buf); pw_stream_queue_buffer(impl->stream, buf);
flush_packets(impl); flush_audio_packets(impl);
} }
static int write_event(uint8_t *p, uint32_t value, void *ev, uint32_t size)
{
uint64_t buffer;
uint8_t b;
int count = 0;
buffer = value & 0x7f;
while ((value >>= 7)) {
buffer <<= 8;
buffer |= ((value & 0x7f) | 0x80);
}
do {
b = buffer & 0xff;
p[count++] = b;
buffer >>= 8;
} while (b & 0x80);
memcpy(&p[count], ev, size);
return count + size;
}
static void flush_midi_packets(struct impl *impl, struct spa_pod_sequence *sequence, uint32_t timestamp)
{
struct spa_pod_control *c;
struct rtp_header header;
struct rtp_midi_header midi_header;
struct iovec iov[3];
struct msghdr msg;
uint32_t len, prev_offset, base;
spa_zero(header);
header.v = 2;
header.pt = impl->payload;
header.ssrc = htonl(impl->ssrc);
spa_zero(midi_header);
midi_header.b = 1;
midi_header.z = 1;
iov[0].iov_base = &header;
iov[0].iov_len = sizeof(header);
iov[1].iov_base = &midi_header;
iov[1].iov_len = sizeof(midi_header);
iov[2].iov_base = impl->buffer;
iov[2].iov_len = 0;
msg.msg_name = NULL;
msg.msg_namelen = 0;
msg.msg_iov = iov;
msg.msg_iovlen = 3;
msg.msg_control = NULL;
msg.msg_controllen = 0;
msg.msg_flags = 0;
prev_offset = len = base = 0;
SPA_POD_SEQUENCE_FOREACH(sequence, c) {
void *ev;
uint32_t size, delta;
if (c->type != SPA_CONTROL_Midi)
continue;
ev = SPA_POD_BODY(&c->value),
size = SPA_POD_BODY_SIZE(&c->value);
if (len > 0 && (len + size > impl->mtu ||
c->offset - base > impl->max_samples)) {
/* flush packet when we have one and when it's either
* too large or has too much data. */
midi_header.len = (len >> 8) & 0xf;
midi_header.len_b = len & 0xff;
iov[2].iov_len = len;
pw_log_debug("sending %d timestamp:%d %u %u",
len, timestamp + base,
c->offset, impl->max_samples);
send_packet(impl, &msg);
len = 0;
}
if (len == 0) {
/* start new packet */
base = prev_offset = c->offset;
header.sequence_number = htons(impl->seq);
header.timestamp = htonl(impl->ts_offset + timestamp + base);
}
delta = c->offset - prev_offset;
prev_offset = c->offset;
len += write_event(&impl->buffer[len], delta, ev, size);
}
if (len > 0) {
/* flush last packet */
midi_header.len = (len >> 8) & 0xf;
midi_header.len_b = len & 0xff;
iov[2].iov_len = len;
pw_log_debug("sending %d timestamp:%d", len, base);
send_packet(impl, &msg);
}
}
static void stream_midi_process(void *data)
{
struct impl *impl = data;
struct pw_buffer *buf;
struct spa_data *d;
uint32_t offs, size, timestamp;
struct spa_pod *pod;
void *ptr;
if ((buf = pw_stream_dequeue_buffer(impl->stream)) == NULL) {
pw_log_debug("Out of stream buffers: %m");
return;
}
d = buf->buffer->datas;
offs = SPA_MIN(d[0].chunk->offset, d[0].maxsize);
size = SPA_MIN(d[0].chunk->size, d[0].maxsize - offs);
if (SPA_LIKELY(impl->io_position))
timestamp = impl->io_position->clock.position;
else
timestamp = 0;
ptr = SPA_PTROFF(d[0].data, offs, void);
if ((pod = spa_pod_from_data(ptr, size, 0, size)) == NULL)
goto done;
if (!spa_pod_is_sequence(pod))
goto done;
if (!impl->sync) {
pw_log_info("sync to timestamp %u", timestamp);
impl->sync = true;
}
flush_midi_packets(impl, (struct spa_pod_sequence*)pod, timestamp);
done:
pw_stream_queue_buffer(impl->stream, buf);
}
static void stream_process(void *data)
{
struct impl *impl = data;
switch (impl->info.media_type) {
case SPA_MEDIA_TYPE_audio:
stream_audio_process(impl);
break;
case SPA_MEDIA_TYPE_application:
stream_midi_process(impl);
break;
}
}
static void stream_io_changed(void *data, uint32_t id, void *area, uint32_t size) static void stream_io_changed(void *data, uint32_t id, void *area, uint32_t size)
{ {
struct impl *impl = data; struct impl *impl = data;
@ -513,9 +687,9 @@ static int setup_stream(struct impl *impl)
if (pw_properties_get(props, PW_KEY_NODE_LATENCY) == NULL) { if (pw_properties_get(props, PW_KEY_NODE_LATENCY) == NULL) {
pw_properties_setf(props, PW_KEY_NODE_LATENCY, pw_properties_setf(props, PW_KEY_NODE_LATENCY,
"%d/%d", impl->psamples, impl->info.rate); "%d/%d", impl->psamples, impl->rate);
} }
pw_properties_setf(props, PW_KEY_NODE_RATE, "1/%d", impl->info.rate); pw_properties_setf(props, PW_KEY_NODE_RATE, "1/%d", impl->rate);
impl->stream = pw_stream_new(impl->core, impl->stream = pw_stream_new(impl->core,
"rtp-sink capture", props); "rtp-sink capture", props);
@ -528,8 +702,21 @@ static int setup_stream(struct impl *impl)
n_params = 0; n_params = 0;
spa_pod_builder_init(&b, buffer, sizeof(buffer)); spa_pod_builder_init(&b, buffer, sizeof(buffer));
params[n_params++] = spa_format_audio_raw_build(&b, SPA_PARAM_EnumFormat,
&impl->info); switch (impl->info.media_type) {
case SPA_MEDIA_TYPE_audio:
params[n_params++] = spa_format_audio_build(&b,
SPA_PARAM_EnumFormat, &impl->info);
break;
case SPA_MEDIA_TYPE_application:
params[n_params++] = spa_pod_builder_add_object(&b,
SPA_TYPE_OBJECT_Format, SPA_PARAM_EnumFormat,
SPA_FORMAT_mediaType, SPA_POD_Id(SPA_MEDIA_TYPE_application),
SPA_FORMAT_mediaSubtype, SPA_POD_Id(SPA_MEDIA_SUBTYPE_control));
break;
default:
return -EINVAL;
}
if ((res = pw_stream_connect(impl->stream, if ((res = pw_stream_connect(impl->stream,
PW_DIRECTION_INPUT, PW_DIRECTION_INPUT,
@ -573,6 +760,9 @@ static void send_sap(struct impl *impl, bool bye)
struct msghdr msg; struct msghdr msg;
struct spa_strbuf buf; struct spa_strbuf buf;
if (!impl->has_sent_sap && bye)
return;
spa_zero(header); spa_zero(header);
header.v = 1; header.v = 1;
header.t = bye; header.t = bye;
@ -613,19 +803,35 @@ static void send_sap(struct impl *impl, bool bye)
"t=%u 0\n" "t=%u 0\n"
"a=recvonly\n" "a=recvonly\n"
"a=tool:PipeWire %s\n" "a=tool:PipeWire %s\n"
"m=audio %u RTP/AVP %i\n" "a=type:broadcast\n",
"a=rtpmap:%i %s/%u/%u\n"
"a=type:broadcast\n"
"a=ptime:%d\n",
user_name, impl->ntp, af, src_addr, user_name, impl->ntp, af, src_addr,
impl->session_name, impl->session_name,
af, dst_addr, dst_ttl, af, dst_addr, dst_ttl,
impl->ntp, impl->ntp,
pw_get_library_version(), pw_get_library_version());
impl->port, impl->payload, spa_strbuf_append(&buf,
impl->payload, impl->format_info->mime, "m=%s %u RTP/AVP %i\n",
impl->info.rate, impl->info.channels, impl->format_info->media_type,
impl->psamples * 1000 / impl->info.rate); impl->port, impl->payload);
switch (impl->info.media_type) {
case SPA_MEDIA_TYPE_audio:
spa_strbuf_append(&buf,
"a=rtpmap:%i %s/%u/%u\n"
"a=ptime:%d\n",
impl->payload, impl->format_info->mime,
impl->info.info.raw.rate,
impl->info.info.raw.channels,
impl->psamples * 1000 / impl->info.info.raw.rate);
break;
case SPA_MEDIA_TYPE_application:
spa_strbuf_append(&buf,
"a=rtpmap:%i %s/%u\n",
impl->payload, impl->format_info->mime,
impl->rate);
break;
}
if (impl->ts_refclk[0] != '\0') { if (impl->ts_refclk[0] != '\0') {
spa_strbuf_append(&buf, spa_strbuf_append(&buf,
@ -649,6 +855,8 @@ static void send_sap(struct impl *impl, bool bye)
msg.msg_flags = 0; msg.msg_flags = 0;
sendmsg(impl->sap_fd, &msg, MSG_NOSIGNAL); sendmsg(impl->sap_fd, &msg, MSG_NOSIGNAL);
impl->has_sent_sap = true;
} }
static void on_timer_event(void *data, uint64_t expirations) static void on_timer_event(void *data, uint64_t expirations)
@ -828,7 +1036,7 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
struct impl *impl; struct impl *impl;
struct pw_properties *props = NULL, *stream_props = NULL; struct pw_properties *props = NULL, *stream_props = NULL;
uint32_t id = pw_global_get_id(pw_impl_module_get_global(module)); uint32_t id = pw_global_get_id(pw_impl_module_get_global(module));
uint32_t pid = getpid(), port, min_samples, max_samples; uint32_t pid = getpid(), port;
int64_t ts_offset; int64_t ts_offset;
char addr[64]; char addr[64];
const char *str; const char *str;
@ -894,16 +1102,51 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
copy_props(impl, props, PW_KEY_MEDIA_NAME); copy_props(impl, props, PW_KEY_MEDIA_NAME);
copy_props(impl, props, PW_KEY_MEDIA_CLASS); copy_props(impl, props, PW_KEY_MEDIA_CLASS);
parse_audio_info(impl->stream_props, &impl->info); impl->info.media_type = SPA_MEDIA_TYPE_audio;
impl->info.media_subtype = SPA_MEDIA_SUBTYPE_raw;
impl->format_info = find_format_info(impl->info.format); if ((str = pw_properties_get(props, "media.type")) != NULL) {
if (impl->format_info == NULL) { if (spa_streq(str, "audio")) {
pw_log_error("unsupported audio format:%d channels:%d", impl->info.media_type = SPA_MEDIA_TYPE_audio;
impl->info.format, impl->info.channels); impl->info.media_subtype = SPA_MEDIA_SUBTYPE_raw;
res = -EINVAL; }
goto out; else if (spa_streq(str, "midi")) {
impl->info.media_type = SPA_MEDIA_TYPE_application;
impl->info.media_subtype = SPA_MEDIA_SUBTYPE_control;
}
else {
pw_log_error("unsupported media type:%s", str);
res = -EINVAL;
goto out;
}
}
switch (impl->info.media_type) {
case SPA_MEDIA_TYPE_audio:
parse_audio_info(impl->stream_props, &impl->info.info.raw);
impl->format_info = find_audio_format_info(&impl->info);
if (impl->format_info == NULL) {
pw_log_error("unsupported audio format:%d channels:%d",
impl->info.info.raw.format, impl->info.info.raw.channels);
res = -EINVAL;
goto out;
}
impl->stride = impl->format_info->size * impl->info.info.raw.channels;
impl->rate = impl->info.info.raw.rate;
break;
case SPA_MEDIA_TYPE_application:
impl->format_info = find_audio_format_info(&impl->info);
if (impl->format_info == NULL) {
res = -EINVAL;
goto out;
}
pw_properties_set(impl->stream_props, PW_KEY_FORMAT_DSP, "8 bit raw midi");
impl->stride = impl->format_info->size;
impl->rate = 48000;
break;
default:
spa_assert_not_reached();
break;
} }
impl->stride = impl->format_info->size * impl->info.channels;
impl->msg_id_hash = rand(); impl->msg_id_hash = rand();
impl->ntp = (uint32_t) time(NULL) + 2208988800U; impl->ntp = (uint32_t) time(NULL) + 2208988800U;
@ -956,11 +1199,11 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
if (!spa_atof(str, &impl->max_ptime)) if (!spa_atof(str, &impl->max_ptime))
impl->max_ptime = DEFAULT_MAX_PTIME; impl->max_ptime = DEFAULT_MAX_PTIME;
min_samples = impl->min_ptime * impl->info.rate / 1000; impl->min_samples = impl->min_ptime * impl->rate / 1000;
max_samples = impl->max_ptime * impl->info.rate / 1000; impl->max_samples = impl->max_ptime * impl->rate / 1000;
impl->psamples = impl->mtu / impl->stride; impl->psamples = impl->mtu / impl->stride;
impl->psamples = SPA_CLAMP(impl->psamples, min_samples, max_samples); impl->psamples = SPA_CLAMP(impl->psamples, impl->min_samples, impl->max_samples);
if ((str = pw_properties_get(props, "sess.name")) == NULL) if ((str = pw_properties_get(props, "sess.name")) == NULL)
pw_properties_setf(props, "sess.name", "PipeWire RTP Stream on %s", pw_properties_setf(props, "sess.name", "PipeWire RTP Stream on %s",
@ -977,7 +1220,7 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
pw_properties_setf(stream_props, "rtp.mtu", "%u", impl->mtu); pw_properties_setf(stream_props, "rtp.mtu", "%u", impl->mtu);
pw_properties_setf(stream_props, "rtp.ttl", "%u", impl->ttl); pw_properties_setf(stream_props, "rtp.ttl", "%u", impl->ttl);
pw_properties_setf(stream_props, "rtp.ptime", "%u", pw_properties_setf(stream_props, "rtp.ptime", "%u",
impl->psamples * 1000 / impl->info.rate); impl->psamples * 1000 / impl->rate);
impl->core = pw_context_get_object(impl->module_context, PW_TYPE_INTERFACE_Core); impl->core = pw_context_get_object(impl->module_context, PW_TYPE_INTERFACE_Core);
if (impl->core == NULL) { if (impl->core == NULL) {

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

@ -20,7 +20,7 @@
#include <spa/utils/ringbuffer.h> #include <spa/utils/ringbuffer.h>
#include <spa/utils/dll.h> #include <spa/utils/dll.h>
#include <spa/param/audio/format-utils.h> #include <spa/param/audio/format-utils.h>
#include <spa/debug/mem.h> #include <spa/control/control.h>
#include <pipewire/pipewire.h> #include <pipewire/pipewire.h>
#include <pipewire/impl.h> #include <pipewire/impl.h>
@ -117,6 +117,8 @@ PW_LOG_TOPIC_STATIC(mod_topic, "mod." NAME);
#define BUFFER_SIZE (1u<<22) #define BUFFER_SIZE (1u<<22)
#define BUFFER_MASK (BUFFER_SIZE-1) #define BUFFER_MASK (BUFFER_SIZE-1)
#define BUFFER_SIZE2 (BUFFER_SIZE>>1)
#define BUFFER_MASK2 (BUFFER_SIZE2-1)
#define USAGE "sap.ip=<SAP IP address to listen on, default "DEFAULT_SAP_IP"> " \ #define USAGE "sap.ip=<SAP IP address to listen on, default "DEFAULT_SAP_IP"> " \
"sap.port=<SAP port to listen on, default "SPA_STRINGIFY(DEFAULT_SAP_PORT)"> " \ "sap.port=<SAP port to listen on, default "SPA_STRINGIFY(DEFAULT_SAP_PORT)"> " \
@ -163,21 +165,26 @@ struct impl {
uint32_t n_sessions; uint32_t n_sessions;
}; };
static const struct format_info { struct format_info {
uint32_t media_subtype;
uint32_t format; uint32_t format;
uint32_t size; uint32_t size;
const char *mime; const char *mime;
} format_info[] = { const char *media_type;
{ SPA_AUDIO_FORMAT_U8, 1, "L8" }, };
{ SPA_AUDIO_FORMAT_ALAW, 1, "PCMA" },
{ SPA_AUDIO_FORMAT_ULAW, 1, "PCMU" }, static const struct format_info audio_format_info[] = {
{ SPA_AUDIO_FORMAT_S16_BE, 2, "L16" }, { SPA_MEDIA_SUBTYPE_raw, SPA_AUDIO_FORMAT_U8, 1, "L8", "audio" },
{ SPA_AUDIO_FORMAT_S24_BE, 3, "L24" }, { SPA_MEDIA_SUBTYPE_raw, SPA_AUDIO_FORMAT_ALAW, 1, "PCMA", "audio" },
{ SPA_MEDIA_SUBTYPE_raw, SPA_AUDIO_FORMAT_ULAW, 1, "PCMU", "audio" },
{ SPA_MEDIA_SUBTYPE_raw, SPA_AUDIO_FORMAT_S16_BE, 2, "L16", "audio" },
{ SPA_MEDIA_SUBTYPE_raw, SPA_AUDIO_FORMAT_S24_BE, 3, "L24", "audio" },
{ SPA_MEDIA_SUBTYPE_control, 0, 1, "rtp-midi", "audio" },
}; };
static const struct format_info *find_format_info(const char *mime) static const struct format_info *find_format_info(const char *mime)
{ {
SPA_FOR_EACH_ELEMENT_VAR(format_info, f) SPA_FOR_EACH_ELEMENT_VAR(audio_format_info, f)
if (spa_streq(f->mime, mime)) if (spa_streq(f->mime, mime))
return f; return f;
return NULL; return NULL;
@ -197,7 +204,8 @@ struct sdp_info {
uint8_t payload; uint8_t payload;
const struct format_info *format_info; const struct format_info *format_info;
struct spa_audio_info_raw info; struct spa_audio_info info;
uint32_t rate;
uint32_t stride; uint32_t stride;
uint32_t ts_offset; uint32_t ts_offset;
@ -236,16 +244,15 @@ struct session {
unsigned direct_timestamp:1; unsigned direct_timestamp:1;
}; };
static void stream_destroy(void *d) static void session_touch(struct session *sess)
{ {
struct session *sess = d; struct timespec ts;
spa_hook_remove(&sess->stream_listener); clock_gettime(CLOCK_MONOTONIC, &ts);
sess->stream = NULL; sess->timestamp = SPA_TIMESPEC_TO_NSEC(&ts);
} }
static void stream_process(void *data) static void process_audio(struct session *sess)
{ {
struct session *sess = data;
struct pw_buffer *buf; struct pw_buffer *buf;
struct spa_data *d; struct spa_data *d;
uint32_t wanted, timestamp, target_buffer, stride, maxsize; uint32_t wanted, timestamp, target_buffer, stride, maxsize;
@ -265,7 +272,7 @@ static void stream_process(void *data)
if (sess->position && sess->direct_timestamp) { if (sess->position && sess->direct_timestamp) {
/* in direct mode, read directly from the timestamp index, /* in direct mode, read directly from the timestamp index,
* because sender and receiver are in sync, this would keep * because sender and receiver are in sync, this would keep
* target_buffer of bytes available. */ * target_buffer of samples available. */
spa_ringbuffer_read_update(&sess->ring, spa_ringbuffer_read_update(&sess->ring,
sess->position->clock.position); sess->position->clock.position);
} }
@ -286,11 +293,7 @@ static void stream_process(void *data)
avail, target_buffer, wanted); avail, target_buffer, wanted);
} else { } else {
float error, corr; float error, corr;
if (avail > (int32_t)SPA_MIN(target_buffer * 8, BUFFER_SIZE / stride)) { if (sess->first) {
pw_log_warn("overrun %u > %u", avail, target_buffer * 8);
timestamp += avail - target_buffer;
avail = target_buffer;
} else if (sess->first) {
if ((uint32_t)avail > target_buffer) { if ((uint32_t)avail > target_buffer) {
uint32_t skip = avail - target_buffer; uint32_t skip = avail - target_buffer;
pw_log_debug("first: avail:%d skip:%u target:%u", pw_log_debug("first: avail:%d skip:%u target:%u",
@ -299,6 +302,10 @@ static void stream_process(void *data)
avail = target_buffer; avail = target_buffer;
} }
sess->first = false; sess->first = false;
} else if (avail > (int32_t)SPA_MIN(target_buffer * 8, BUFFER_SIZE / stride)) {
pw_log_warn("overrun %u > %u", avail, target_buffer * 8);
timestamp += avail - target_buffer;
avail = target_buffer;
} }
if (!sess->direct_timestamp) { if (!sess->direct_timestamp) {
/* when not using direct timestamp and clocks are not /* when not using direct timestamp and clocks are not
@ -335,6 +342,244 @@ static void stream_process(void *data)
pw_stream_queue_buffer(sess->stream, buf); pw_stream_queue_buffer(sess->stream, buf);
} }
static void receive_audio(struct session *sess, uint8_t *packet,
uint32_t timestamp, uint32_t payload_offset, uint32_t len)
{
uint32_t plen = len - payload_offset;
uint8_t *payload = &packet[payload_offset];
uint32_t stride = sess->info.stride;
uint32_t samples = plen / stride;
uint32_t write, expected_write;
int32_t filled;
filled = spa_ringbuffer_get_write_index(&sess->ring, &expected_write);
/* we always write to timestamp + delay */
write = timestamp + sess->target_buffer;
if (!sess->have_sync) {
pw_log_info("sync to timestamp %u direct:%d", write, sess->direct_timestamp);
/* we read from timestamp, keeping target_buffer of data
* in the ringbuffer. */
sess->ring.readindex = timestamp;
sess->ring.writeindex = write;
filled = sess->target_buffer;
spa_dll_init(&sess->dll);
spa_dll_set_bw(&sess->dll, SPA_DLL_BW_MIN, 128, sess->info.rate);
memset(sess->buffer, 0, BUFFER_SIZE);
sess->have_sync = true;
} else if (expected_write != write) {
pw_log_debug("unexpected write (%u != %u)",
write, expected_write);
}
if (filled + samples > BUFFER_SIZE / stride) {
pw_log_debug("capture overrun %u + %u > %u", filled, samples,
BUFFER_SIZE / stride);
sess->have_sync = false;
} else {
pw_log_debug("got samples:%u", samples);
spa_ringbuffer_write_data(&sess->ring,
sess->buffer,
BUFFER_SIZE,
(write * stride) & BUFFER_MASK,
payload, (samples * stride));
write += samples;
spa_ringbuffer_write_update(&sess->ring, write);
}
}
static void process_midi(struct session *sess)
{
struct pw_buffer *buf;
struct spa_data *d;
uint32_t timestamp, duration, maxsize, read;
struct spa_pod_builder b;
struct spa_pod_frame f[1];
void *ptr;
struct spa_pod *pod;
struct spa_pod_control *c;
if ((buf = pw_stream_dequeue_buffer(sess->stream)) == NULL) {
pw_log_debug("Out of stream buffers: %m");
return;
}
d = buf->buffer->datas;
maxsize = d[0].maxsize;
duration = sess->position->clock.duration;
if (sess->position && sess->direct_timestamp)
timestamp = sess->position->clock.position;
else
timestamp = 0;
/* we copy events into the buffer based on the rtp timestamp + delay.
* With direct timestamp we lock them to the graph position. Otherwise
* we fill the current cycle with events we have. The first event offset
* might be wrong, in this case. */
spa_pod_builder_init(&b, d[0].data, maxsize);
spa_pod_builder_push_sequence(&b, &f[0], 0);
while (true) {
int32_t avail = spa_ringbuffer_get_read_index(&sess->ring, &read);
if (avail <= 0)
break;
ptr = SPA_PTROFF(sess->buffer, read & BUFFER_MASK2, void);
if ((pod = spa_pod_from_data(ptr, avail, 0, avail)) == NULL)
goto done;
if (!spa_pod_is_sequence(pod))
goto done;
/* the ringbuffer contains series of sequences, one for each
* received packet */
SPA_POD_SEQUENCE_FOREACH((struct spa_pod_sequence*)pod, c) {
/* try to render with given delay */
uint32_t target = c->offset + sess->target_buffer;
if (timestamp != 0) {
/* skip old packets */
if (target < timestamp)
continue;
/* event for next cycle */
if (target >= timestamp + duration)
goto complete;
} else {
timestamp = target;
}
spa_pod_builder_control(&b, target - timestamp, SPA_CONTROL_Midi);
spa_pod_builder_bytes(&b,
SPA_POD_BODY(&c->value),
SPA_POD_BODY_SIZE(&c->value));
}
/* we completed a sequence (one RTP packet), advance ringbuffer
* and go to the next packet */
read += SPA_PTRDIFF(c, ptr);
spa_ringbuffer_read_update(&sess->ring, read);
}
complete:
spa_pod_builder_pop(&b, &f[0]);
if (b.state.offset > maxsize) {
pw_log_warn("overflow buffer %u %u", b.state.offset, maxsize);
b.state.offset = 0;
}
d[0].chunk->size = b.state.offset;
d[0].chunk->stride = 1;
d[0].chunk->offset = 0;
done:
pw_stream_queue_buffer(sess->stream, buf);
}
static int parse_varlen(uint8_t *p, uint32_t avail, uint32_t *result)
{
uint32_t value = 0, offs = 0;
while (offs < avail) {
uint8_t b = p[offs++];
value = (value << 7) | (b & 0x7f);
if ((b & 0x80) == 0)
break;
}
*result = value;
return offs;
}
static int get_midi_size(uint8_t *p, uint32_t avail)
{
int size;
uint32_t offs = 0, value;
switch (p[offs++]) {
case 0xc0 ... 0xdf:
size = 2;
break;
case 0x80 ... 0xbf:
case 0xe0 ... 0xef:
size = 3;
break;
case 0xff:
case 0xf0:
case 0xf7:
size = parse_varlen(&p[offs], avail - offs, &value);
size += value + 1;
break;
default:
return -EINVAL;
}
return size;
}
static void receive_midi(struct session *sess, uint8_t *packet,
uint32_t timestamp, uint32_t payload_offset, uint32_t plen)
{
uint32_t write;
struct rtp_midi_header *hdr;
int32_t filled;
struct spa_pod_builder b;
struct spa_pod_frame f[1];
void *ptr;
uint32_t offs = payload_offset, len, end;
bool first = true;
if (!sess->have_sync) {
pw_log_info("sync to timestamp %u direct:%d", timestamp, sess->direct_timestamp);
sess->have_sync = true;
}
filled = spa_ringbuffer_get_write_index(&sess->ring, &write);
if (filled > (int32_t)BUFFER_SIZE2)
return;
hdr = (struct rtp_midi_header *)&packet[offs++];
len = hdr->len;
if (hdr->b) {
len = (len << 8) | hdr->len_b;
offs++;
}
end = len + offs;
if (end > plen)
return;
ptr = SPA_PTROFF(sess->buffer, write & BUFFER_MASK2, void);
/* each packet is written as a sequence of events. The offset is
* the RTP timestamp */
spa_pod_builder_init(&b, ptr, BUFFER_SIZE2 - filled);
spa_pod_builder_push_sequence(&b, &f[0], 0);
while (offs < end) {
uint32_t delta;
int size;
if (first && !hdr->z)
delta = 0;
else
offs += parse_varlen(&packet[offs], end - offs, &delta);
timestamp += delta;
spa_pod_builder_control(&b, timestamp, SPA_CONTROL_Midi);
size = get_midi_size(&packet[offs], end - offs);
if (size <= 0 || offs + size > end) {
pw_log_warn("invalid size (%08x) %d (%u %u)",
packet[offs], size, offs, end);
break;
}
spa_pod_builder_bytes(&b, &packet[offs], size);
offs += size;
first = false;
}
spa_pod_builder_pop(&b, &f[0]);
write += b.state.offset;
spa_ringbuffer_write_update(&sess->ring, write);
}
static void stream_io_changed(void *data, uint32_t id, void *area, uint32_t size) static void stream_io_changed(void *data, uint32_t id, void *area, uint32_t size)
{ {
struct session *sess = data; struct session *sess = data;
@ -348,11 +593,24 @@ static void stream_io_changed(void *data, uint32_t id, void *area, uint32_t size
} }
} }
static void session_touch(struct session *sess) static void stream_destroy(void *d)
{ {
struct timespec ts; struct session *sess = d;
clock_gettime(CLOCK_MONOTONIC, &ts); spa_hook_remove(&sess->stream_listener);
sess->timestamp = SPA_TIMESPEC_TO_NSEC(&ts); sess->stream = NULL;
}
static void stream_process(void *data)
{
struct session *sess = data;
switch (sess->info.info.media_type) {
case SPA_MEDIA_TYPE_audio:
process_audio(sess);
break;
case SPA_MEDIA_TYPE_application:
process_midi(sess);
break;
}
} }
static void static void
@ -361,12 +619,11 @@ on_rtp_io(void *data, int fd, uint32_t mask)
struct session *sess = data; struct session *sess = data;
struct rtp_header *hdr; struct rtp_header *hdr;
ssize_t len, hlen; ssize_t len, hlen;
uint8_t buffer[2048], *payload; uint8_t buffer[2048];
if (mask & SPA_IO_IN) { if (mask & SPA_IO_IN) {
uint32_t stride, read, timestamp, expected_timestamp, samples;
uint16_t seq; uint16_t seq;
int32_t filled; uint32_t timestamp;
if ((len = recv(fd, buffer, sizeof(buffer), 0)) < 0) if ((len = recv(fd, buffer, sizeof(buffer), 0)) < 0)
goto receive_error; goto receive_error;
@ -395,46 +652,14 @@ on_rtp_io(void *data, int fd, uint32_t mask)
sess->expected_seq = seq + 1; sess->expected_seq = seq + 1;
sess->have_seq = true; sess->have_seq = true;
stride = sess->info.stride; timestamp = ntohl(hdr->timestamp) - sess->info.ts_offset;
samples = (len - hlen) / stride;
payload = &buffer[hlen];
filled = spa_ringbuffer_get_write_index(&sess->ring, &expected_timestamp); switch (sess->info.info.media_type) {
case SPA_MEDIA_TYPE_audio:
read = ntohl(hdr->timestamp) - sess->info.ts_offset; receive_audio(sess, buffer, timestamp, hlen, len);
/* we always write to timestamp + delay */ break;
timestamp = read + sess->target_buffer; case SPA_MEDIA_TYPE_application:
receive_midi(sess, buffer, timestamp, hlen, len);
if (!sess->have_sync) {
pw_log_info("sync to timestamp %u", read);
/* we read from timestamp, keeping target_buffer of data
* in the ringbuffer. */
sess->ring.readindex = read;
sess->ring.writeindex = timestamp;
filled = sess->target_buffer;
spa_dll_init(&sess->dll);
spa_dll_set_bw(&sess->dll, SPA_DLL_BW_MIN, 128, sess->info.info.rate);
memset(sess->buffer, 0, BUFFER_SIZE);
sess->have_sync = true;
} else if (expected_timestamp != timestamp) {
pw_log_debug("unexpected timestamp (%u != %u)",
timestamp, expected_timestamp);
}
if (filled + samples > BUFFER_SIZE / stride) {
pw_log_debug("capture overrun %u + %u > %u", filled, samples,
BUFFER_SIZE / stride);
sess->have_sync = false;
} else {
pw_log_trace("got samples:%u", samples);
spa_ringbuffer_write_data(&sess->ring,
sess->buffer,
BUFFER_SIZE,
(timestamp * stride) & BUFFER_MASK,
payload, (samples * stride));
timestamp += samples;
spa_ringbuffer_write_update(&sess->ring, timestamp);
} }
sess->receiving = true; sess->receiving = true;
} }
@ -537,7 +762,7 @@ error:
static uint32_t msec_to_samples(struct sdp_info *info, uint32_t msec) static uint32_t msec_to_samples(struct sdp_info *info, uint32_t msec)
{ {
return msec * info->info.rate / 1000; return msec * info->rate / 1000;
} }
static void session_free(struct session *sess) static void session_free(struct session *sess)
@ -677,7 +902,7 @@ static int session_new(struct impl *impl, struct sdp_info *info)
pw_properties_set(props, "rtp.origin", info->origin); pw_properties_set(props, "rtp.origin", info->origin);
pw_properties_setf(props, "rtp.payload", "%u", info->payload); pw_properties_setf(props, "rtp.payload", "%u", info->payload);
pw_properties_setf(props, "rtp.fmt", "%s/%u/%u", info->format_info->mime, pw_properties_setf(props, "rtp.fmt", "%s/%u/%u", info->format_info->mime,
info->info.rate, info->info.channels); info->rate, info->info.info.raw.channels);
if (info->session[0]) { if (info->session[0]) {
pw_properties_set(props, "rtp.session", info->session); pw_properties_set(props, "rtp.session", info->session);
pw_properties_setf(props, PW_KEY_MEDIA_NAME, "RTP Stream (%s)", pw_properties_setf(props, PW_KEY_MEDIA_NAME, "RTP Stream (%s)",
@ -715,12 +940,12 @@ static int session_new(struct impl *impl, struct sdp_info *info)
session->target_buffer = msec_to_samples(info, sess_latency_msec); session->target_buffer = msec_to_samples(info, sess_latency_msec);
session->max_error = msec_to_samples(info, ERROR_MSEC); session->max_error = msec_to_samples(info, ERROR_MSEC);
pw_properties_setf(props, PW_KEY_NODE_RATE, "1/%d", info->info.rate); pw_properties_setf(props, PW_KEY_NODE_RATE, "1/%d", info->rate);
pw_properties_setf(props, PW_KEY_NODE_LATENCY, "%d/%d", pw_properties_setf(props, PW_KEY_NODE_LATENCY, "%d/%d",
session->target_buffer / 2, info->info.rate); session->target_buffer / 2, info->rate);
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, info->rate);
if (info->channelmap[0]) { if (info->channelmap[0]) {
pw_properties_set(props, PW_KEY_NODE_CHANNELNAMES, info->channelmap); pw_properties_set(props, PW_KEY_NODE_CHANNELNAMES, info->channelmap);
@ -741,8 +966,21 @@ static int session_new(struct impl *impl, struct sdp_info *info)
n_params = 0; n_params = 0;
spa_pod_builder_init(&b, buffer, sizeof(buffer)); spa_pod_builder_init(&b, buffer, sizeof(buffer));
params[n_params++] = spa_format_audio_raw_build(&b, SPA_PARAM_EnumFormat,
&info->info); switch (info->info.media_type) {
case SPA_MEDIA_TYPE_audio:
params[n_params++] = spa_format_audio_build(&b,
SPA_PARAM_EnumFormat, &info->info);
break;
case SPA_MEDIA_TYPE_application:
params[n_params++] = spa_pod_builder_add_object(&b,
SPA_TYPE_OBJECT_Format, SPA_PARAM_EnumFormat,
SPA_FORMAT_mediaType, SPA_POD_Id(SPA_MEDIA_TYPE_application),
SPA_FORMAT_mediaSubtype, SPA_POD_Id(SPA_MEDIA_SUBTYPE_control));
break;
default:
return -EINVAL;
}
if ((res = pw_stream_connect(session->stream, if ((res = pw_stream_connect(session->stream,
PW_DIRECTION_OUTPUT, PW_DIRECTION_OUTPUT,
@ -893,26 +1131,43 @@ static int parse_sdp_a_rtpmap(struct impl *impl, char *c, struct sdp_info *info)
if (info->format_info == NULL) if (info->format_info == NULL)
return -EINVAL; return -EINVAL;
info->info.format = info->format_info->format;
info->stride = info->format_info->size; info->stride = info->format_info->size;
info->info.media_subtype = info->format_info->media_subtype;
c += strlen(c) + 1; c += strlen(c) + 1;
if (sscanf(c, "%u/%u", &rate, &channels) == 2) {
info->info.rate = rate; switch (info->info.media_subtype) {
info->info.channels = channels; case SPA_MEDIA_SUBTYPE_raw:
info->info.media_type = SPA_MEDIA_TYPE_audio;
info->info.info.raw.format = info->format_info->format;
if (sscanf(c, "%u/%u", &rate, &channels) == 2) {
info->info.info.raw.channels = channels;
} else if (sscanf(c, "%u", &rate) == 1) {
info->info.info.raw.channels = 1;
} else
return -EINVAL;
info->info.info.raw.rate = rate;
pw_log_debug("rate: %d, ch: %d", rate, channels); pw_log_debug("rate: %d, ch: %d", rate, channels);
if (channels == 2) {
info->info.position[0] = SPA_AUDIO_CHANNEL_FL; if (channels == 1) {
info->info.position[1] = SPA_AUDIO_CHANNEL_FR; info->info.info.raw.position[0] = SPA_AUDIO_CHANNEL_MONO;
} else if (channels == 2) {
info->info.info.raw.position[0] = SPA_AUDIO_CHANNEL_FL;
info->info.info.raw.position[1] = SPA_AUDIO_CHANNEL_FR;
} }
} else if (sscanf(c, "%u", &rate) == 1) { info->stride *= channels;
info->info.rate = rate; info->rate = rate;
info->info.channels = 1; break;
} else case SPA_MEDIA_SUBTYPE_control:
return -EINVAL; info->info.media_type = SPA_MEDIA_TYPE_application;
if (sscanf(c, "%u", &rate) != 1)
info->stride *= info->info.channels; return -EINVAL;
info->rate = rate;
break;
}
return 0; return 0;
} }

18
src/modules/module-rtp/rtp.h
View file

@ -51,6 +51,24 @@ struct rtp_payload {
#endif #endif
} __attribute__ ((packed)); } __attribute__ ((packed));
struct rtp_midi_header {
#if __BYTE_ORDER == __LITTLE_ENDIAN
unsigned len:4;
unsigned p:1;
unsigned z:1;
unsigned j:1;
unsigned b:1;
uint8_t len_b;
#elif __BYTE_ORDER == __BIG_ENDIAN
unsigned b:1;
unsigned j:1;
unsigned z:1;
unsigned p:1;
unsigned len:4;
uint8_t len_b;
#endif
} __attribute__ ((packed));
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif