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

feat: ndiout supports audio-only mode (video optional)

Browse Source 
flow_id is now optional (config().contains). When absent: skip the
MXL reader, active-wait, and NDI video path entirely. Video buffers
and NDI video frames are heap-allocated only when has_video.

Loop pacing: video branch sleeps 1ms on TOO_EARLY as before; audio-only
path sleeps 1ms when no chunk was available (audio_advanced == false)
to avoid busy-spinning.

NDI sender name changed from the video flow UUID to node_id(), which
is stable and human-readable for both video and audio-only modes.

To use audio-only: wire only audio_flow_id in build_graph, omit flow_id.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
JohannesItten
2026-07-03 10:11:06 +03:00
parent 9fd41b0312
commit 5504b8983e
1 changed files with 120 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nodes/ndiout/main.cpp
+59 -29
View File
@@ -33,15 +33,26 @@ struct NDIContext {
class NDIOutNode : public dmf::NodeBase { class NDIOutNode : public dmf::NodeBase {
void run() override { void run() override {
// --- video flow --- // --- video flow (optional) ---
const auto flow_info = config().at("flow_id"); bool has_video = config().contains("flow_id");
const auto flow_id = flow_info.at("id").get<std::string>();
const int width = flow_info.value("width", 1920);
const int height = flow_info.value("height", 1080);
const int fps_num = flow_info.value("fps_num", 25);
const int fps_den = flow_info.value("fps_den", 1);
log("flow=%s %dx%d @ %d/%d fps", flow_id.c_str(), width, height, fps_num, fps_den); int width = 1920;
int height = 1080;
int fps_num = 25;
int fps_den = 1;
std::string flow_id;
mxlFlowReader video_reader{};
uint32_t video_stride = 0;
if (has_video) {
const auto flow_info = config().at("flow_id");
flow_id = flow_info.at("id").get<std::string>();
width = flow_info.value("width", 1920);
height = flow_info.value("height", 1080);
fps_num = flow_info.value("fps_num", 25);
fps_den = flow_info.value("fps_den", 1);
log("video flow=%s %dx%d @ %d/%d fps", flow_id.c_str(), width, height, fps_num, fps_den);
log("waiting for flow to become active..."); log("waiting for flow to become active...");
bool active = false; bool active = false;
@@ -52,12 +63,12 @@ class NDIOutNode : public dmf::NodeBase {
if (!dmf::g_running) return; if (!dmf::g_running) return;
log("flow active — starting read"); log("flow active — starting read");
mxlFlowReader video_reader{};
mxlFlowConfigInfo video_cfg{}; mxlFlowConfigInfo video_cfg{};
mxlStatus vst = mxlCreateFlowReader(instance(), flow_id.c_str(), nullptr, &video_reader); mxlStatus vst = mxlCreateFlowReader(instance(), flow_id.c_str(), nullptr, &video_reader);
if (vst != MXL_STATUS_OK) { log("mxlCreateFlowReader failed (status=%d)", vst); return; } if (vst != MXL_STATUS_OK) { log("video mxlCreateFlowReader failed (status=%d)", vst); return; }
mxlFlowReaderGetConfigInfo(video_reader, &video_cfg); mxlFlowReaderGetConfigInfo(video_reader, &video_cfg);
const uint32_t video_stride = video_cfg.discrete.sliceSizes[0]; video_stride = video_cfg.discrete.sliceSizes[0];
}
// --- audio flow (optional) --- // --- audio flow (optional) ---
mxlFlowReader audio_reader{}; mxlFlowReader audio_reader{};
@@ -88,13 +99,17 @@ class NDIOutNode : public dmf::NodeBase {
} }
} }
NDIContext ndi(flow_id.c_str()); if (!has_video && !has_audio) { log("no flows configured — exiting"); return; }
// V210 intermediate and P216 send buffers for NDI video NDIContext ndi(node_id().c_str());
std::vector<uint8_t> v210_buf(video_stride * height);
std::vector<uint8_t> p216_buf(width * sizeof(uint16_t) * 2 * height); // Video buffers and NDI frames (only when has_video)
std::vector<uint8_t> v210_buf, p216_buf;
NDIlib_video_frame_v2_t v210_frame{}, p216_frame{};
if (has_video) {
v210_buf.resize(video_stride * height);
p216_buf.resize(width * sizeof(uint16_t) * 2 * height);
NDIlib_video_frame_v2_t v210_frame{};
v210_frame.xres = width; v210_frame.xres = width;
v210_frame.yres = height; v210_frame.yres = height;
v210_frame.frame_rate_N = fps_num; v210_frame.frame_rate_N = fps_num;
@@ -103,7 +118,6 @@ class NDIOutNode : public dmf::NodeBase {
v210_frame.line_stride_in_bytes = video_stride; v210_frame.line_stride_in_bytes = video_stride;
v210_frame.p_data = v210_buf.data(); v210_frame.p_data = v210_buf.data();
NDIlib_video_frame_v2_t p216_frame{};
p216_frame.xres = width; p216_frame.xres = width;
p216_frame.yres = height; p216_frame.yres = height;
p216_frame.FourCC = NDIlib_FourCC_video_type_P216; p216_frame.FourCC = NDIlib_FourCC_video_type_P216;
@@ -111,8 +125,9 @@ class NDIOutNode : public dmf::NodeBase {
p216_frame.frame_rate_D = fps_den; p216_frame.frame_rate_D = fps_den;
p216_frame.line_stride_in_bytes = width * static_cast<int>(sizeof(uint16_t)); p216_frame.line_stride_in_bytes = width * static_cast<int>(sizeof(uint16_t));
p216_frame.p_data = p216_buf.data(); p216_frame.p_data = p216_buf.data();
}
// Float planar buffer for NDI audio (ch0 samples, ch1 samples, ...) // Audio buffer and NDI frame (only when has_audio)
std::vector<float> audio_planar(static_cast<size_t>(channels) * samples_per_frame); std::vector<float> audio_planar(static_cast<size_t>(channels) * samples_per_frame);
NDIlib_audio_frame_v3_t ndi_audio{}; NDIlib_audio_frame_v3_t ndi_audio{};
if (has_audio) { if (has_audio) {
@@ -125,14 +140,8 @@ class NDIOutNode : public dmf::NodeBase {
} }
// --- main loop --- // --- main loop ---
const mxlRational video_rate = {fps_num, fps_den}; uint64_t video_index = 0;
uint64_t video_index = mxlGetCurrentIndex(&video_rate);
uint64_t audio_index = 0; uint64_t audio_index = 0;
if (has_audio) {
const mxlRational audio_rate = {sample_rate, 1};
audio_index = mxlGetCurrentIndex(&audio_rate);
}
uint64_t frame_count = 0; uint64_t frame_count = 0;
uint64_t invalid_count = 0; uint64_t invalid_count = 0;
uint64_t late_count = 0; uint64_t late_count = 0;
@@ -140,8 +149,18 @@ class NDIOutNode : public dmf::NodeBase {
auto wall_start = std::chrono::steady_clock::now(); auto wall_start = std::chrono::steady_clock::now();
auto last_log_time = wall_start; auto last_log_time = wall_start;
if (has_video) {
const mxlRational video_rate = {fps_num, fps_den};
video_index = mxlGetCurrentIndex(&video_rate);
}
if (has_audio) {
const mxlRational audio_rate = {sample_rate, 1};
audio_index = mxlGetCurrentIndex(&audio_rate);
}
while (dmf::g_running.load(std::memory_order_relaxed)) { while (dmf::g_running.load(std::memory_order_relaxed)) {
// --- audio: non-blocking, one chunk per video frame --- // --- audio: non-blocking, one chunk per video frame (or free-running) ---
bool audio_advanced = false;
if (has_audio) { if (has_audio) {
mxlWrappedMultiBufferSlice audio_slices{}; mxlWrappedMultiBufferSlice audio_slices{};
mxlStatus ast = mxlFlowReaderGetSamplesNonBlocking( mxlStatus ast = mxlFlowReaderGetSamplesNonBlocking(
@@ -164,6 +183,7 @@ class NDIOutNode : public dmf::NodeBase {
} }
NDIlib_send_send_audio_v3(ndi.sender, &ndi_audio); NDIlib_send_send_audio_v3(ndi.sender, &ndi_audio);
audio_index += samples_per_frame; audio_index += samples_per_frame;
audio_advanced = true;
} else if (ast == MXL_ERR_OUT_OF_RANGE_TOO_LATE) { } else if (ast == MXL_ERR_OUT_OF_RANGE_TOO_LATE) {
mxlFlowRuntimeInfo ari{}; mxlFlowRuntimeInfo ari{};
mxlFlowReaderGetRuntimeInfo(audio_reader, &ari); mxlFlowReaderGetRuntimeInfo(audio_reader, &ari);
@@ -172,9 +192,11 @@ class NDIOutNode : public dmf::NodeBase {
} }
// --- video --- // --- video ---
if (has_video) {
mxlGrainInfo video_grain{}; mxlGrainInfo video_grain{};
uint8_t* video_buf = nullptr; uint8_t* video_buf = nullptr;
vst = mxlFlowReaderGetGrainNonBlocking(video_reader, video_index, &video_grain, &video_buf); mxlStatus vst = mxlFlowReaderGetGrainNonBlocking(
video_reader, video_index, &video_grain, &video_buf);
if (vst == MXL_STATUS_OK) { if (vst == MXL_STATUS_OK) {
frame_count++; frame_count++;
@@ -202,7 +224,7 @@ class NDIOutNode : public dmf::NodeBase {
video_index = ri.headIndex; video_index = ri.headIndex;
} else { } else {
log("unexpected status=%d on index=%llu", vst, video_index); log("unexpected video status=%d on index=%llu", vst, video_index);
break; break;
} }
@@ -214,11 +236,19 @@ class NDIOutNode : public dmf::NodeBase {
static_cast<double>(frame_count) / elapsed); static_cast<double>(frame_count) / elapsed);
last_log_time = now; last_log_time = now;
} }
} else if (!audio_advanced) {
// audio-only and nothing was ready — avoid busy spin
mxlSleepForNs(1'000'000);
}
} }
if (has_video)
log("stopped — total frames=%llu invalid=%llu late=%llu", log("stopped — total frames=%llu invalid=%llu late=%llu",
frame_count, invalid_count, late_count); frame_count, invalid_count, late_count);
mxlReleaseFlowReader(instance(), video_reader); else
log("stopped");
if (has_video) mxlReleaseFlowReader(instance(), video_reader);
if (has_audio) mxlReleaseFlowReader(instance(), audio_reader); if (has_audio) mxlReleaseFlowReader(instance(), audio_reader);
} }
}; };