From 6d2b43b51cb126983f1947c93033abc3206961a9 Mon Sep 17 00:00:00 2001
From: Dmitry Sharshakov <d3dx12.xx@gmail.com>
Date: Thu, 8 Jun 2023 16:57:31 +0300
Subject: [PATCH] pipewire-aes67: improve default config

Ensure visibility in Dante Controller, improve SAP config

Co-authored-by: Sebastian Jaeckel <wose@zuendmasse.de>
---
 src/daemon/pipewire-aes67.conf.in | 53 +++++++++++++++++++++++++++----
 src/daemon/pipewire.conf.in       |  4 +--
 2 files changed, 48 insertions(+), 9 deletions(-)

diff --git a/src/daemon/pipewire-aes67.conf.in b/src/daemon/pipewire-aes67.conf.in
index c0f14b36b..94713ef59 100644
--- a/src/daemon/pipewire-aes67.conf.in
+++ b/src/daemon/pipewire-aes67.conf.in
@@ -18,11 +18,6 @@ context.properties = {
     #default.clock.quantum-limit = 8192
 }
 
-#context.spa-libs = {
-#    audio.convert.* = audioconvert/libspa-audioconvert
-#    support.*       = support/libspa-support
-#}
-
 context.modules = [
     { name = libpipewire-module-rt
         args = {
@@ -41,6 +36,8 @@ context.modules = [
             local.ifname = eth0
             sap.ip = 239.255.255.255
             sap.port = 9875
+            net.ttl = 32
+            net.loop = true
 
             stream.rules = [
                 {
@@ -57,8 +54,50 @@ context.modules = [
                             sess.latency.msec = 10
                         }
                     }
-                }
+                },
+                {
+                    matches = [
+                        {
+                            sess.sap.announce = true
+                        }
+                    ]
+                    actions = {
+                        announce-stream = {}
+                    }
+               }
             ]
         }
-    }
+    },
+    { name = libpipewire-module-rtp-sink
+        args = {
+            local.ifname = eth0
+            destination.ip = 239.69.150.243
+            destination.port = 5004
+            net.mtu = 1280
+            net.ttl = 32
+            net.loop = true
+            sess.min-ptime = 1
+            sess.max-ptime = 1
+            sess.name = "PipeWire RTP stream"
+            sess.media = "audio"
+            sess.ts-refclk = "ptp=traceable"
+            sess.ts-offset = 0
+            sess.ptime = 1
+            sess.latency.msec = 1
+            sess.announce = true
+            audio.format = "S24BE"
+            audio.rate = 48000
+            audio.channels = 2
+            audio.position = [ FL FR ]
+
+            stream.props = {
+                node.name = "rtp-sink"
+                media.class = "Audio/Sink"
+                node.virtual = false
+                device.api = aes67
+                sess.sap.announce = true
+                node.always-process = true
+            }
+        }
+    },
 ]
diff --git a/src/daemon/pipewire.conf.in b/src/daemon/pipewire.conf.in
index 697bf094d..3d63bb6ea 100644
--- a/src/daemon/pipewire.conf.in
+++ b/src/daemon/pipewire.conf.in
@@ -230,8 +230,8 @@ context.objects = [
     #        node.group      = pipewire.ptp0
     #        priority.driver = 30000
     #        clock.name      = "clock.system.ptp0"
-    #        #clock.id       = tai
-    #        clock.device    = "/dev/ptp0"
+    #        clock.id        = tai
+    #        #clock.device   = "/dev/ptp0"
     #    }
     #}