From 35f7772cbb250d1979ddcf747d125e92c063eea4 Mon Sep 17 00:00:00 2001 From: Andrea Bondavalli Date: Tue, 18 May 2021 19:23:54 +0200 Subject: [PATCH] Added to the WebUI the possibility to configure the following additional TIC frame size: 64, 128. Updated daemon documentation with info on the new driver patch to remove unsupported non-interleved access that enables compatibility with JACK audio. Changed default daemon configuration file to use a TIC frame size of 64 to enable configuring an ALSA period compatible with JACk audio. Updated daemon version to 1.2. --- README.md | 1 + daemon/README.md | 2 +- daemon/daemon.conf | 2 +- daemon/main.cpp | 2 +- test/daemon.conf | 2 +- webui/src/Config.js | 2 ++ 6 files changed, 7 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index f1f7116..257f65c 100644 --- a/README.md +++ b/README.md @@ -83,6 +83,7 @@ The [aes67-daemon branch of ravenna-alsa-lkm repository](https://github.com/bond The following patches have been applied to the original module: +* patch to remove unsupported non-interleved access from driver capabilities. This enables compatibility with JACK audio (from driver version v1.3) * patch to enable the usage of a PTP master clock on the daemon host (from driver version v1.1) * patch to rework the driver PCM interface and to simplify and unify handling of read-write interlaved and memory mapped access modes * patch to remove user space transfer handling from convert functions diff --git a/daemon/README.md b/daemon/README.md index 3943d2c..e442d6c 100644 --- a/daemon/README.md +++ b/daemon/README.md @@ -239,7 +239,7 @@ where: > JSON number specifying the default safety playout delay at 1FS in samples. > **tic\_frame\_size\_at\_1fs** -> JSON number specifying the TIC frame size at 1FS in samples, valid range is from 6 to 192 samples. +> JSON number specifying the TIC frame size at 1FS in samples, valid range is from 32 to 192 samples. > This global setting is used to determine the driver base timer period. For example with a value of 192 samples this period is set to 4ms and the outgoing RTP packets are scheduled for being sent every 4ms resulting on an average latency greater than 4ms. > **max\_tic\_frame\_size** diff --git a/daemon/daemon.conf b/daemon/daemon.conf index 8204681..b37ed4f 100644 --- a/daemon/daemon.conf +++ b/daemon/daemon.conf @@ -4,7 +4,7 @@ "http_base_dir": "../webui/build", "log_severity": 2, "playout_delay": 0, - "tic_frame_size_at_1fs": 48, + "tic_frame_size_at_1fs": 64, "max_tic_frame_size": 1024, "sample_rate": 48000, "rtp_mcast_base": "239.1.0.1", diff --git a/daemon/main.cpp b/daemon/main.cpp index 8a1e698..3bc5c3d 100644 --- a/daemon/main.cpp +++ b/daemon/main.cpp @@ -35,7 +35,7 @@ namespace po = boost::program_options; namespace postyle = boost::program_options::command_line_style; namespace logging = boost::log; -static std::string version("bondagit-1.1"); +static std::string version("bondagit-1.2"); static std::atomic terminate = false; void termination_handler(int signum) { diff --git a/test/daemon.conf b/test/daemon.conf index fc4df41..4e349be 100644 --- a/test/daemon.conf +++ b/test/daemon.conf @@ -4,7 +4,7 @@ "http_base_dir": "./webui/build", "log_severity": 3, "playout_delay": 0, - "tic_frame_size_at_1fs": 48, + "tic_frame_size_at_1fs": 64, "max_tic_frame_size": 1024, "sample_rate": 48000, "rtp_mcast_base": "239.1.0.1", diff --git a/webui/src/Config.js b/webui/src/Config.js index 9aaf0bc..d498f15 100644 --- a/webui/src/Config.js +++ b/webui/src/Config.js @@ -162,7 +162,9 @@ class Config extends Component {