Added to the WebUI the possibility to configure the following additio…

…nal 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.
bondagit · May 18, 2021 · 35f7772 · 35f7772
1 parent 88dff95
commit 35f7772
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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<bool> terminate = false;
 
 void termination_handler(int signum) {

diff --git 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
@@ -162,7 +162,9 @@ class Config extends Component {
             <th align="left">
               <select value={this.state.ticFrameSizeAt1fs} onChange={e => this.setState({ticFrameSizeAt1fs: e.target.value})}>
                 <option value="48">48 - 1ms</option>
+                <option value="64">64 - 1.3ms</option>
                 <option value="96">96 - 2ms</option>
+                <option value="128">128 - 2.7ms</option>
                 <option value="192">192 - 4ms</option>
               </select>
             </th>