Merge pull request #235 from bondagit/issue-232-234

bondagit · web-flow · commit bff6ec0f6cea · 2025-11-22T09:22:24.000+01:00
Issue 230 232 234
diff --git a/3rdparty/ravenna-alsa-lkm b/3rdparty/ravenna-alsa-lkm
@@ -1 +1 @@
-Subproject commit 61ebb0b3f898ab0edc553b630fbb988c7b24fa2e
+Subproject commit e1ecd6a3f998396ee3066c3ff8fa4f246a560144
diff --git a/README.md b/README.md
@@ -263,7 +263,7 @@ The script allows a user to test a specific configuration and it can be used to
 
       Usage run_test.sh sample_format sample_rate channels duration
            sample_format can be one of S16_LE, S24_3LE, S32_LE
-           sample_rate can be one of 44100, 48000, 88200, 96000, 192000, 384000
+           sample_rate can be one of 44100, 48000, 88200, 96000, 176400, 192000, 352800, 384000
            channels can be one of 2, 4, 6, up to 64
            duration is in the range 1 to 10 minutes
 
diff --git a/daemon/README.md b/daemon/README.md
@@ -261,7 +261,7 @@ where:
 
 > **sample\_rate**
 > JSON number specifying the default sample rate.
-> Valid values are 44100Hz, 48000Hz, 88200Hz, 96000Hz, 192000Hz and 384000Hz.
+> Valid values are 44100Hz, 48000Hz, 88200Hz, 96000Hz, 176400Hz, 192000Hz, 352800Hz and 384000Hz.
 
 > **playout\_delay**
 > JSON number specifying the default safety playout delay at 1FS in samples.
diff --git a/daemon/config.cpp b/daemon/config.cpp
@@ -120,10 +120,9 @@ std::shared_ptr<Config> Config::parse(const std::string& filename,
   if (ip_str.empty()) {
     std::cerr << "Cannot retrieve IPv4 address for interface "
               << config.interface_name_ << std::endl;
-  } else {
-    config.ip_addr_ = ip_addr;
-    config.ip_str_ = ip_str;
   }
+  config.ip_addr_ = ip_addr;
+  config.ip_str_ = ip_str;
 
   config.config_filename_ = filename;
   config.daemon_restart_ = false;
diff --git a/daemon/interface.cpp b/daemon/interface.cpp
@@ -93,7 +93,7 @@ std::tuple<uint32_t, std::string, bool> get_new_interface_ip(
 
   auto [ip_addr, ip_str] = get_interface_ip(interface_name);
   BOOST_LOG_TRIVIAL(info) << "interface " << interface_name
-                          << " new IP address " << ip_str;
+                          << " new IP address <" << ip_str << ">";
   return { ip_addr, ip_str, true };
 }
 
diff --git a/daemon/main.cpp b/daemon/main.cpp
@@ -43,7 +43,7 @@ namespace po = boost::program_options;
 namespace postyle = boost::program_options::command_line_style;
 namespace logging = boost::log;
 
-static const std::string version("bondagit-2.1.1");
+static const std::string version("bondagit-2.1.2");
 static std::atomic<bool> terminate = false;
 
 void termination_handler(int signum) {
@@ -117,9 +117,9 @@ int main(int argc, char* argv[]) {
 
   if (current_watchdog_usec > 0) {
     // Inform systemd that if we're not petting the dog in 5s we're bust.
-    sd_notify(0, "WATCHDOG_USEC=5000000");
+    sd_notify(0, "WATCHDOG_USEC=10000000");
 
-    current_watchdog_usec = 5000000;
+    current_watchdog_usec = 10000000;
   }
 #endif
 
diff --git a/run_latency_test.sh b/run_latency_test.sh
@@ -15,7 +15,7 @@ function cleanup {
 function usage {
   echo 'Usage run_latency_test.sh sample_format sample_rate channels duration frames' >&2
   echo '  sample_format can be one of S16_LE, S24_3LE, S32_LE' >&2
-  echo '  sample_rate can be one of 44100, 48000, 88200, 96000, 192000, 384000' >&2
+  echo '  sample_rate can be one of 44100, 48000, 88200, 96000, 176400, 192000, 352800, 384000' >&2
   echo '  channels can be one of 2, 4, 6, up to 64' >&2
   echo '  duration in seconds' >&2
   echo '  frames buffer size in frames' >&2
diff --git a/run_test.sh b/run_test.sh
@@ -45,7 +45,7 @@ echo 'Creating test file ...' >&2
 if ! ./createtest $1 $2 $3 $4 ; then
   echo 'Usage run_test.sh sample_format sample_rate channels duration' >&2
   echo '  sample_format can be one of S16_LE, S24_3LE, S32_LE' >&2
-  echo '  sample_rate can be one of 44100, 48000, 88200, 96000, 192000, 384000' >&2
+  echo '  sample_rate can be one of 44100, 48000, 88200, 96000, 176400, 192000, 352800, 384000' >&2
   echo '  channels can be one of 2, 4, 6, up to 64' >&2
   echo '  duration is in the range 1 to 10 minutes' >&2
   exit 1
diff --git a/systemd/aes67-daemon.service b/systemd/aes67-daemon.service
@@ -7,6 +7,8 @@ After=network.target
 Type=notify
 # Will be adjusted by service during startup
 WatchdogSec=10
+# In case of no IP we wait forever
+TimeoutStartSec=0
 
 # Run as separate user created via sysusers.d
 User=aes67-daemon
diff --git a/systemd/daemon.conf b/systemd/daemon.conf
@@ -2,9 +2,9 @@
   "http_port": 8080,
   "rtsp_port": 8854,
   "http_base_dir": "/usr/local/share/aes67-daemon/webui/",
-  "log_severity": 1,
+  "log_severity": 2,
   "playout_delay": 0,
-  "tic_frame_size_at_1fs": 64,
+  "tic_frame_size_at_1fs": 48,
   "max_tic_frame_size": 1024,
   "sample_rate": 48000,
   "rtp_mcast_base": "239.1.0.1",
diff --git a/test/createtest.cc b/test/createtest.cc
@@ -25,7 +25,7 @@ int main(int argc, char* argv[])
   }
 
   int rate(atoi(argv[2]));
-  if (rate != 44100 && rate != 48000 && rate != 88200 && rate != 96000 && rate != 192000 && rate != 384000) {
+  if (rate != 44100 && rate != 48000 && rate != 88200 && rate != 96000 && rate != 176400 && rate != 192000 && rate != 352800 && rate != 384000) {
     cerr << "Unsupported rate " << rate << endl;
     exit(1);
   }
diff --git a/webui/package-lock.json b/webui/package-lock.json
diff --git a/webui/package.json b/webui/package.json
@@ -19,7 +19,7 @@
   },
   "devDependencies": {
     "@vitejs/plugin-react-refresh": "^1.3.3",
-    "vite": "^6.2.7"
+    "vite": "^6.4.1"
   },
   "browserslist": {
     "production": [
diff --git a/webui/src/Config.jsx b/webui/src/Config.jsx
@@ -221,7 +221,9 @@ class Config extends Component {
                 <option value="48000">48 kHz</option>
                 <option value="88200">88.2 kHz</option>
                 <option value="96000">96 kHz</option>
+                <option value="176400">176.4 kHz</option>
                 <option value="192000">192 kHz</option>
+                <option value="352800">352.8 kHz</option>
                 <option value="384000">384 kHz</option>
               </select>
             </th>

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ std::tuple<uint32_t, std::string, bool> get_new_interface_ip(`
`93`	`93`
`94`	`94`	`auto [ip_addr, ip_str] = get_interface_ip(interface_name);`
`95`	`95`	`BOOST_LOG_TRIVIAL(info) << "interface " << interface_name`
`96`		`- << " new IP address " << ip_str;`
	`96`	`+ << " new IP address <" << ip_str << ">";`
`97`	`97`	`return { ip_addr, ip_str, true };`
`98`	`98`	`}`
`99`	`99`