multi-client support

.github/iwyu.imp

@@ -43,4 +43,6 @@
 
 	{ include: [ '<spandsp/plc.h>', private, '<spandsp.h>', public ] },
 
+	{ include: [ '<bits/types/struct_itimerspec.h>', private, '<sys/timerfd.h>', public ] },
+
 ]

.github/spellcheck-wordlist.txt

@@ -157,6 +157,8 @@ BTRH
 BTT
 bttransport
 btusb
+# aspell considers PIPE_BUF to be 2 words :(
+BUF
 CCE
 CIEV
 CIND
@@ -183,6 +185,7 @@ ENODEV
 EP
 EPIPE
 EPMR
+epoll
 EQMID
 errno
 FB

doc/bluealsa.8.rst

@@ -58,6 +58,12 @@ OPTIONS
     Without this option, **bluealsa** registers itself as an "org.bluealsa"
     D-Bus service.  For more information see the EXAMPLES_ below.
 
+-M, --multi-client
+    Permit multiple clients to connect to the same PCM stream.
+    Without this option, only one client can connect to a PCM.
+    With this option, for playback clients, the streams are mixed together;
+    for capture each client receives a copy of the stream.
+
 -i hciX, --device=hciX
     HCI device to use. Can be specified multiple times to select more than one
     HCI.  Because HCI numbering can change after a system reboot, this option

src/Makefile.am

@@ -35,6 +35,9 @@ bluealsa_SOURCES = \
 	ba-transport-pcm.c \
 	bluealsa-dbus.c \
 	bluealsa-iface.xml \
+	bluealsa-mix-buffer.c \
+	bluealsa-pcm-client.c \
+	bluealsa-pcm-multi.c \
 	bluez.c \
 	bluez-iface.xml \
 	codec-sbc.c \

src/a2dp-aac.c

@@ -30,6 +30,7 @@
 #include "ba-config.h"
 #include "ba-transport.h"
 #include "ba-transport-pcm.h"
+#include "bluealsa-pcm-multi.h"
 #include "io.h"
 #include "rtp.h"
 #include "utils.h"
@@ -288,6 +289,11 @@ void *a2dp_aac_enc_thread(struct ba_transport_pcm *t_pcm) {
 		goto fail_ffb;
 	}
 
+	/* start multi client thread if required. */
+	if (t_pcm->multi &&
+			!bluealsa_pcm_multi_init(t_pcm->multi, pcm.nmemb))
+		goto fail_ffb;
+
 	rtp_header_t *rtp_header;
 	/* initialize RTP header and get anchor for payload */
 	uint8_t *rtp_payload = rtp_a2dp_init(bt.data, &rtp_header, NULL, 0);
@@ -468,6 +474,11 @@ void *a2dp_aac_dec_thread(struct ba_transport_pcm *t_pcm) {
 		goto fail_ffb;
 	}
 
+	/* start multi client thread if required. */
+	if (t_pcm->multi &&
+			!bluealsa_pcm_multi_init(t_pcm->multi, pcm.nmemb))
+		goto fail_ffb;
+
 	struct rtp_state rtp = { .synced = false };
 	/* RTP clock frequency equal to 90kHz */
 	rtp_state_init(&rtp, samplerate, 90000);

src/a2dp-aptx-hd.c

@@ -26,6 +26,7 @@
 #include "ba-config.h"
 #include "ba-transport.h"
 #include "ba-transport-pcm.h"
+#include "bluealsa-pcm-multi.h"
 #include "codec-aptx.h"
 #include "io.h"
 #include "rtp.h"
@@ -138,6 +139,11 @@ void *a2dp_aptx_hd_enc_thread(struct ba_transport_pcm *t_pcm) {
 		goto fail_ffb;
 	}
 
+	/* start multi client thread if required. */
+	if (t_pcm->multi &&
+			!bluealsa_pcm_multi_init(t_pcm->multi, pcm.nmemb))
+		goto fail_ffb;
+
 	rtp_header_t *rtp_header;
 	/* initialize RTP header and get anchor for payload */
 	uint8_t *rtp_payload = rtp_a2dp_init(bt.data, &rtp_header, NULL, 0);
@@ -271,6 +277,11 @@ void *a2dp_aptx_hd_dec_thread(struct ba_transport_pcm *t_pcm) {
 		goto fail_ffb;
 	}
 
+	/* start multi client thread if required. */
+	if (t_pcm->multi &&
+			!bluealsa_pcm_multi_init(t_pcm->multi, pcm.nmemb))
+		goto fail_ffb;
+
 	struct rtp_state rtp = { .synced = false };
 	/* RTP clock frequency equal to audio samplerate */
 	rtp_state_init(&rtp, samplerate, samplerate);

src/a2dp-aptx.c

@@ -25,6 +25,7 @@
 #include "ba-config.h"
 #include "ba-transport.h"
 #include "ba-transport-pcm.h"
+#include "bluealsa-pcm-multi.h"
 #include "codec-aptx.h"
 #include "io.h"
 #include "shared/a2dp-codecs.h"
@@ -135,6 +136,11 @@ void *a2dp_aptx_enc_thread(struct ba_transport_pcm *t_pcm) {
 		goto fail_ffb;
 	}
 
+	/* start multi client thread if required. */
+	if (t_pcm->multi &&
+			!bluealsa_pcm_multi_init(t_pcm->multi, pcm.nmemb))
+		goto fail_ffb;
+
 	debug_transport_pcm_thread_loop(t_pcm, "START");
 	for (ba_transport_pcm_state_set_running(t_pcm);;) {
 
@@ -249,6 +255,11 @@ void *a2dp_aptx_dec_thread(struct ba_transport_pcm *t_pcm) {
 		goto fail_ffb;
 	}
 
+	/* start multi client thread if required. */
+	if (t_pcm->multi &&
+			!bluealsa_pcm_multi_init(t_pcm->multi, pcm.nmemb))
+		goto fail_ffb;
+
 	debug_transport_pcm_thread_loop(t_pcm, "START");
 	for (ba_transport_pcm_state_set_running(t_pcm);;) {
 

src/a2dp-faststream.c

@@ -24,6 +24,7 @@
 #include "ba-config.h"
 #include "ba-transport.h"
 #include "ba-transport-pcm.h"
+#include "bluealsa-pcm-multi.h"
 #include "codec-sbc.h"
 #include "io.h"
 #include "shared/a2dp-codecs.h"
@@ -150,6 +151,11 @@ void *a2dp_faststream_enc_thread(struct ba_transport_pcm *t_pcm) {
 		goto fail_ffb;
 	}
 
+	/* start multi client thread if required. */
+	if (t_pcm->multi &&
+			!bluealsa_pcm_multi_init(t_pcm->multi, pcm.nmemb))
+		goto fail_ffb;
+
 	debug_transport_pcm_thread_loop(t_pcm, "START");
 	for (ba_transport_pcm_state_set_running(t_pcm);;) {
 
@@ -270,6 +276,11 @@ void *a2dp_faststream_dec_thread(struct ba_transport_pcm *t_pcm) {
 		goto fail_ffb;
 	}
 
+	/* start multi client thread if required. */
+	if (t_pcm->multi &&
+			!bluealsa_pcm_multi_init(t_pcm->multi, pcm.nmemb))
+		goto fail_ffb;
+
 	debug_transport_pcm_thread_loop(t_pcm, "START");
 	for (ba_transport_pcm_state_set_running(t_pcm);;) {
 

src/a2dp-lc3plus.c

@@ -247,6 +247,11 @@ void *a2dp_lc3plus_enc_thread(struct ba_transport_pcm *t_pcm) {
 		goto fail_ffb;
 	}
 
+	/* start multi client thread if required. */
+	if (t_pcm->multi &&
+			!bluealsa_pcm_multi_init(t_pcm->multi, pcm.nmemb))
+		goto fail_ffb;
+
 	rtp_header_t *rtp_header;
 	rtp_media_header_t *rtp_media_header;
 	/* initialize RTP headers and get anchor for payload */
@@ -455,6 +460,11 @@ void *a2dp_lc3plus_dec_thread(struct ba_transport_pcm *t_pcm) {
 		goto fail_ffb;
 	}
 
+	/* start multi client thread if required. */
+	if (t_pcm->multi &&
+			!bluealsa_pcm_multi_init(t_pcm->multi, pcm.nmemb))
+		goto fail_ffb;
+
 	struct rtp_state rtp = { .synced = false };
 	/* RTP clock frequency equal to the RTP clock rate */
 	rtp_state_init(&rtp, samplerate, rtp_ts_clockrate);

src/a2dp-ldac.c

@@ -27,6 +27,7 @@
 #include "ba-transport.h"
 #include "ba-transport-pcm.h"
 #include "ba-config.h"
+#include "bluealsa-pcm-multi.h"
 #include "io.h"
 #include "rtp.h"
 #include "utils.h"
@@ -166,6 +167,11 @@ void *a2dp_ldac_enc_thread(struct ba_transport_pcm *t_pcm) {
 		goto fail_ffb;
 	}
 
+	/* start multi client thread if required. */
+	if (t_pcm->multi &&
+			!bluealsa_pcm_multi_init(t_pcm->multi, pcm.nmemb))
+		goto fail_ffb;
+
 	rtp_header_t *rtp_header;
 	rtp_media_header_t *rtp_media_header;
 	/* initialize RTP headers and get anchor for payload */
@@ -323,6 +329,11 @@ void *a2dp_ldac_dec_thread(struct ba_transport_pcm *t_pcm) {
 		goto fail_ffb;
 	}
 
+	/* start multi client thread if required. */
+	if (t_pcm->multi &&
+			!bluealsa_pcm_multi_init(t_pcm->multi, pcm.nmemb))
+		goto fail_ffb;
+
 	struct rtp_state rtp = { .synced = false };
 	/* RTP clock frequency equal to audio samplerate */
 	rtp_state_init(&rtp, samplerate, samplerate);

src/a2dp-mpeg.c

@@ -35,6 +35,7 @@
 #include "ba-config.h"
 #include "ba-transport.h"
 #include "ba-transport-pcm.h"
+#include "bluealsa-pcm-multi.h"
 #include "io.h"
 #include "rtp.h"
 #include "utils.h"
@@ -226,6 +227,11 @@ void *a2dp_mp3_enc_thread(struct ba_transport_pcm *t_pcm) {
 		goto fail_ffb;
 	}
 
+	/* start multi client thread if required. */
+	if (t_pcm->multi &&
+			!bluealsa_pcm_multi_init(t_pcm->multi, pcm.nmemb))
+		goto fail_ffb;
+
 	rtp_header_t *rtp_header;
 	rtp_mpeg_audio_header_t *rtp_mpeg_audio_header;
 	/* initialize RTP headers and get anchor for payload */
@@ -411,6 +417,11 @@ void *a2dp_mpeg_dec_thread(struct ba_transport_pcm *t_pcm) {
 		goto fail_ffb;
 	}
 
+	/* start multi client thread if required. */
+	if (t_pcm->multi &&
+			!bluealsa_pcm_multi_init(t_pcm->multi, pcm.nmemb))
+		goto fail_ffb;
+
 	struct rtp_state rtp = { .synced = false };
 	/* RTP clock frequency equal to 90kHz */
 	rtp_state_init(&rtp, samplerate, 90000);

src/a2dp-opus.c

@@ -166,6 +166,11 @@ void *a2dp_opus_enc_thread(struct ba_transport_pcm *t_pcm) {
 		goto fail_ffb;
 	}
 
+	/* start multi client thread if required. */
+	if (t_pcm->multi &&
+			!bluealsa_pcm_multi_init(t_pcm->multi, pcm.nmemb))
+		goto fail_ffb;
+
 	rtp_header_t *rtp_header;
 	rtp_media_header_t *rtp_media_header;
 	/* initialize RTP headers and get anchor for payload */
@@ -292,6 +297,11 @@ void *a2dp_opus_dec_thread(struct ba_transport_pcm *t_pcm) {
 		goto fail_ffb;
 	}
 
+	/* start multi client thread if required. */
+	if (t_pcm->multi &&
+			!bluealsa_pcm_multi_init(t_pcm->multi, pcm.nmemb))
+		goto fail_ffb;
+
 	struct rtp_state rtp = { .synced = false };
 	/* RTP clock frequency equal to audio sampling rate */
 	rtp_state_init(&rtp, sampling, sampling);

src/a2dp-sbc.c

@@ -29,6 +29,7 @@
 #include "ba-transport.h"
 #include "ba-transport-pcm.h"
 #include "ba-config.h"
+#include "bluealsa-pcm-multi.h"
 #include "codec-sbc.h"
 #include "io.h"
 #include "rtp.h"
@@ -177,6 +178,11 @@ void *a2dp_sbc_enc_thread(struct ba_transport_pcm *t_pcm) {
 		goto fail_ffb;
 	}
 
+	/* start multi client thread if required. */
+	if (t_pcm->multi &&
+			!bluealsa_pcm_multi_init(t_pcm->multi, pcm.nmemb))
+		goto fail_ffb;
+
 	rtp_header_t *rtp_header;
 	rtp_media_header_t *rtp_media_header;
 
@@ -320,6 +326,11 @@ void *a2dp_sbc_dec_thread(struct ba_transport_pcm *t_pcm) {
 		goto fail_ffb;
 	}
 
+	/* start multi client thread if required. */
+	if (t_pcm->multi &&
+			!bluealsa_pcm_multi_init(t_pcm->multi, pcm.nmemb))
+		goto fail_ffb;
+
 	struct rtp_state rtp = { .synced = false };
 	/* RTP clock frequency equal to audio samplerate */
 	rtp_state_init(&rtp, samplerate, samplerate);