itten/dmf-studio-rnd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: NDI node correctness and robustness fixes

Browse Source 
NDIHelper:
- find_sources: check g_running each attempt to avoid 50s block on shutdown
- getV210_video_frame: fix P216 branch (fall-through + local pointer reassignment bug)
- getV210_video_frame: status_change re-queries source info instead of throwing
- select_source: fix typo "recieve" → "receive"

ndiout:
- set frame_rate_N/frame_rate_D on the NDI send frame (was 0/0)
- add per-second stats logging (matching fakesink pattern)
- add missing <chrono> include
- fix typo "reciever" → "receiver"

ndiin:
- read source_num from NODE_CONFIG (key: "source_num", default 0)
- wrap hot-loop NDI call in try/catch so source-lost terminates cleanly
- pass source_num through to getV210_video_frame

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
JohannesItten
2026-07-01 12:07:45 +03:00
parent 19ea14a61c
commit 7a32fa20af
3 changed files with 60 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nodes/ndiin/main.cpp
+10 -6
View File
@@ -10,15 +10,15 @@
class NDIInNode : public dmf::NodeBase {
void run() override {
const uint32_t source_num = config().value("source_num", 0);
dmf::NDIHelper ndi_helper;
try {
std::vector<std::string> ndi_sources;
ndi_helper.find_sources(&ndi_sources, 5000);
log("Available NDI sources:");
for (const auto& source_name : ndi_sources){
log("%s", source_name.c_str());
}
uint32_t source_num = 0;
for (const auto& source_name : ndi_sources)
log(" %s", source_name.c_str());
ndi_helper.select_source(source_num);
ndi_helper.get_source_info(source_num);
} catch (const std::runtime_error& e) {
@@ -63,8 +63,12 @@ class NDIInNode : public dmf::NodeBase {
bool last_ndi_frame_valid = false;
while (dmf::g_running.load(std::memory_order_relaxed)) {
if (ndi_helper.getV210_video_frame(0, latest_buffer, stride)) {
last_ndi_frame_valid = true;
try {
if (ndi_helper.getV210_video_frame(source_num, latest_buffer, stride))
last_ndi_frame_valid = true;
} catch (const std::runtime_error& e) {
log("NDI error: %s — stopping", e.what());
break;
}
uint8_t* buf = nullptr;
nodes/ndiout/main.cpp
+22 -12
View File
@@ -1,3 +1,4 @@
#include <chrono>
#include <string>
#include <mxl/flow.h>
#include <mxl/time.h>
@@ -38,12 +39,12 @@ class NDIOutNode : public dmf::NodeBase {
const mxlRational rate = {fps_num, fps_den};
uint64_t index = mxlGetCurrentIndex(&rate);
uint64_t frame_count = 0;
uint64_t invalid_count = 0;
uint64_t late_count = 0;
auto wall_start = std::chrono::steady_clock::now();
auto last_log_time = wall_start;
uint64_t index = mxlGetCurrentIndex(&rate);
uint64_t frame_count = 0;
uint64_t invalid_count = 0;
uint64_t late_count = 0;
auto wall_start = std::chrono::steady_clock::now();
auto last_log_time = wall_start;
// NDI part
if (!NDIlib_initialize()) {
@@ -73,9 +74,10 @@ class NDIOutNode : public dmf::NodeBase {
NDI_video_frame_10bit.p_data = (uint8_t*)malloc(NDI_video_frame_10bit.line_stride_in_bytes * NDI_video_frame_10bit.yres);
NDIlib_video_frame_v2_t NDI_video_frame_16bit;
NDI_video_frame_16bit.xres = NDI_video_frame_10bit.xres;
NDI_video_frame_16bit.yres = NDI_video_frame_10bit.yres;
NDI_video_frame_16bit.xres = NDI_video_frame_10bit.xres;
NDI_video_frame_16bit.yres = NDI_video_frame_10bit.yres;
NDI_video_frame_16bit.frame_rate_N = fps_num;
NDI_video_frame_16bit.frame_rate_D = fps_den;
NDI_video_frame_16bit.line_stride_in_bytes = NDI_video_frame_16bit.xres * sizeof(uint16_t);
NDI_video_frame_16bit.p_data = (uint8_t*)malloc(NDI_video_frame_16bit.line_stride_in_bytes * 2 * NDI_video_frame_16bit.yres);
//
@@ -98,9 +100,8 @@ class NDIOutNode : public dmf::NodeBase {
NDIlib_util_V210_to_P216(&NDI_video_frame_10bit, &NDI_video_frame_16bit);
NDIlib_send_send_video_v2(pNDI_send, &NDI_video_frame_16bit);
ndi_frame_counter++;
if (ndi_frame_counter == 1) {
log("NDI reciever got feed");
}
if (ndi_frame_counter == 1)
log("NDI receiver connected");
} else if (st == MXL_ERR_OUT_OF_RANGE_TOO_EARLY) {
mxlSleepForNs(1'000'000); // 1 ms poll
@@ -114,6 +115,15 @@ class NDIOutNode : public dmf::NodeBase {
log("unexpected status=%d on index=%llu", st, index);
break;
}
auto now = std::chrono::steady_clock::now();
if (std::chrono::duration<double>(now - last_log_time).count() >= 1.0) {
const double elapsed = std::chrono::duration<double>(now - wall_start).count();
log("frames=%llu invalid=%llu late=%llu avg=%.2f fps",
frame_count, invalid_count, late_count,
static_cast<double>(frame_count) / elapsed);
last_log_time = now;
}
}
log("stopped — total frames=%llu invalid=%llu late=%llu",