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: make source from module

Browse source 
Add match rules to SAP to decide when to announce and create RTP
streams.
Use SAP to load an RTP source.
Remove SAP code from RTP source.
This commit is contained in:
Wim Taymans 2023-02-21 17:18:52 +01:00
parent cb1e5661dc
commit a48822c38a
3 changed files with 1223 additions and 938 deletions
Download patch file Download diff file Expand all files Collapse all files

937
src/modules/module-rtp-sap.c
View file

File diff suppressed because it is too large Load diff

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

@ -27,7 +27,6 @@
#include <module-rtp/rtp.h>
/** \page page_module_rtp_sink PipeWire Module: RTP sink
*
* The `rtp-sink` module creates a PipeWire sink that sends audio
@ -74,10 +73,10 @@
* context.modules = [
* { name = libpipewire-module-rtp-sink
* args = {
* #local.ifname = "eth0"
* #source.ip = "0.0.0.0"
* #destination.ip = "224.0.0.56"
* #destination.port = 46000
* #local.ifname = "eth0"
* #net.mtu = 1280
* #net.ttl = 1
* #net.loop = false
@ -105,15 +104,9 @@
PW_LOG_TOPIC_STATIC(mod_topic, "mod." NAME);
#define PW_LOG_TOPIC_DEFAULT mod_topic
#define SAP_INTERVAL_SEC 5
#define SAP_MIME_TYPE "application/sdp"
#define BUFFER_SIZE (1u<<20)
#define BUFFER_MASK (BUFFER_SIZE-1)
#define DEFAULT_SAP_IP "224.0.0.56"
#define DEFAULT_SAP_PORT 9875
#define DEFAULT_SESS_MEDIA "audio"
#define DEFAULT_FORMAT "S16BE"
@ -135,6 +128,7 @@ PW_LOG_TOPIC_STATIC(mod_topic, "mod." NAME);
#define USAGE "source.ip=<source IP address, default:"DEFAULT_SOURCE_IP"> " \
"destination.ip=<destination IP address, default:"DEFAULT_DESTINATION_IP"> " \
"destination.port=<int, default random beteen 46000 and 47024> " \
"local.ifname=<local interface name to use> " \
"net.mtu=<desired MTU, default:"SPA_STRINGIFY(DEFAULT_MTU)"> " \
"net.ttl=<desired TTL, default:"SPA_STRINGIFY(DEFAULT_TTL)"> " \
@ -214,9 +208,9 @@ struct impl {
int rtp_fd;
unsigned sync:1;
unsigned apple_midi:1;
};
static void stream_destroy(void *d)
{
struct impl *impl = d;
@ -366,7 +360,7 @@ static void stream_audio_process(struct impl *impl)
}
}
if (!impl->sync) {
pw_log_info("sync to timestamp %u", timestamp);
pw_log_info("sync to timestamp %u ts_offset:%u", timestamp, impl->ts_offset);
impl->ring.readindex = impl->ring.writeindex = timestamp;
memset(impl->buffer, 0, BUFFER_SIZE);
impl->sync = true;
@ -487,7 +481,6 @@ static void flush_midi_packets(struct impl *impl, struct spa_pod_sequence *seque
static void send_cmd(struct impl *impl)
{
// struct rtp_header header;
uint8_t buffer[16];
struct iovec iov[3];
struct msghdr msg;
@ -541,7 +534,7 @@ static void stream_midi_process(void *data)
if (!impl->sync) {
pw_log_info("sync to timestamp %u", timestamp);
impl->sync = true;
if (impl->apple_midi)
send_cmd(impl);
}
@ -962,6 +955,7 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
copy_props(impl, props, PW_KEY_NODE_GROUP);
copy_props(impl, props, PW_KEY_NODE_LATENCY);
copy_props(impl, props, PW_KEY_NODE_VIRTUAL);
copy_props(impl, props, PW_KEY_NODE_CHANNELNAMES);
copy_props(impl, props, PW_KEY_MEDIA_NAME);
copy_props(impl, props, PW_KEY_MEDIA_CLASS);

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

File diff suppressed because it is too large Load diff