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

refactor: align testpattern naming with ndiin/ndiout

Browse Source 
cfg_info → video_cfg, stride → video_stride, writer → video_writer,
grain/buf → video_grain/video_buf, index → video_index, st → vst,
audio_info/audio_id → audio_flow_info/audio_flow_id.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
JohannesItten
2026-07-03 09:59:36 +03:00
parent b7fb54e2bc
commit 2a5d3758b6
1 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nodes/testpattern/main.cpp
+33 -33
View File
@@ -21,18 +21,18 @@ class TestPatternNode : public dmf::NodeBase {
log("flow=%s %dx%d @ %d/%d fps pattern=%s", log("flow=%s %dx%d @ %d/%d fps pattern=%s",
flow_id.c_str(), width, height, fps_num, fps_den, pattern.c_str()); flow_id.c_str(), width, height, fps_num, fps_den, pattern.c_str());
mxlFlowWriter writer{}; mxlFlowWriter video_writer{};
mxlFlowConfigInfo cfg_info{}; mxlFlowConfigInfo video_cfg{};
bool created = false; bool created = false;
mxlStatus st = mxlCreateFlowWriter( mxlStatus vst = mxlCreateFlowWriter(
instance(), instance(),
dmf::make_video_flow_def(flow_id, node_id(), width, height, fps_num, fps_den).c_str(), dmf::make_video_flow_def(flow_id, node_id(), width, height, fps_num, fps_den).c_str(),
nullptr, &writer, &cfg_info, &created); nullptr, &video_writer, &video_cfg, &created);
if (st != MXL_STATUS_OK) { log("video mxlCreateFlowWriter failed (status=%d)", st); return; } if (vst != MXL_STATUS_OK) { log("video mxlCreateFlowWriter failed (status=%d)", vst); return; }
const uint32_t stride = cfg_info.discrete.sliceSizes[0]; const uint32_t video_stride = video_cfg.discrete.sliceSizes[0];
log("video stride=%u B/line grain=%u B ring=%u grains", log("video stride=%u B/line grain=%u B ring=%u grains",
stride, stride * static_cast<uint32_t>(height), cfg_info.discrete.grainCount); video_stride, video_stride * static_cast<uint32_t>(height), video_cfg.discrete.grainCount);
// --- audio flow (optional) --- // --- audio flow (optional) ---
mxlFlowWriter audio_writer{}; mxlFlowWriter audio_writer{};
@@ -42,16 +42,16 @@ class TestPatternNode : public dmf::NodeBase {
bool has_audio = config().contains("audio_flow_id"); bool has_audio = config().contains("audio_flow_id");
if (has_audio) { if (has_audio) {
const auto audio_info = config().at("audio_flow_id"); const auto audio_flow_info = config().at("audio_flow_id");
const auto audio_id = audio_info.at("id").get<std::string>(); const auto audio_flow_id = audio_flow_info.at("id").get<std::string>();
sample_rate = audio_info.value("sample_rate", 48000); sample_rate = audio_flow_info.value("sample_rate", 48000);
channels = audio_info.value("channels", 2); channels = audio_flow_info.value("channels", 2);
log("audio flow=%s %d Hz %dch", audio_id.c_str(), sample_rate, channels); log("audio flow=%s %d Hz %dch", audio_flow_id.c_str(), sample_rate, channels);
mxlStatus ast = mxlCreateFlowWriter( mxlStatus ast = mxlCreateFlowWriter(
instance(), instance(),
dmf::make_audio_flow_def(audio_id, node_id(), sample_rate, channels, 32, dmf::make_audio_flow_def(audio_flow_id, node_id(), sample_rate, channels, 32,
fps_num, fps_den).c_str(), fps_num, fps_den).c_str(),
nullptr, &audio_writer, &audio_cfg, &created); nullptr, &audio_writer, &audio_cfg, &created);
if (ast != MXL_STATUS_OK) { if (ast != MXL_STATUS_OK) {
@@ -72,29 +72,29 @@ class TestPatternNode : public dmf::NodeBase {
// -18 dBFS broadcast reference level // -18 dBFS broadcast reference level
const float amplitude = static_cast<float>(std::pow(10.0, -18.0 / 20.0)); const float amplitude = static_cast<float>(std::pow(10.0, -18.0 / 20.0));
uint64_t index = mxlGetCurrentIndex(&video_rate); uint64_t video_index = mxlGetCurrentIndex(&video_rate);
uint64_t audio_index = has_audio ? mxlGetCurrentIndex(&audio_rate) : 0; uint64_t audio_index = has_audio ? mxlGetCurrentIndex(&audio_rate) : 0;
log("start video_index=%llu", index); log("start video_index=%llu", video_index);
while (dmf::g_running.load(std::memory_order_relaxed)) { while (dmf::g_running.load(std::memory_order_relaxed)) {
// --- video grain --- // --- video grain ---
mxlGrainInfo grain{}; mxlGrainInfo video_grain{};
uint8_t* buf = nullptr; uint8_t* video_buf = nullptr;
st = mxlFlowWriterOpenGrain(writer, index, &grain, &buf); vst = mxlFlowWriterOpenGrain(video_writer, video_index, &video_grain, &video_buf);
if (st != MXL_STATUS_OK) { if (vst != MXL_STATUS_OK) {
log("OpenGrain failed (status=%d), skipping index=%llu", st, index); log("OpenGrain failed (status=%d), skipping index=%llu", vst, video_index);
index++; video_index++;
continue; continue;
} }
if (pattern == "bars") dmf::v210::fill_colorbars(buf, width, height, stride); if (pattern == "bars") dmf::v210::fill_colorbars(video_buf, width, height, video_stride);
else if (pattern == "ire") dmf::v210::fill_ire_ramp (buf, width, height, stride); else if (pattern == "ire") dmf::v210::fill_ire_ramp (video_buf, width, height, video_stride);
else if (pattern == "black") dmf::v210::fill_black (buf, width, height, stride); else if (pattern == "black") dmf::v210::fill_black (video_buf, width, height, video_stride);
else if (pattern == "white") dmf::v210::fill_white (buf, width, height, stride); else if (pattern == "white") dmf::v210::fill_white (video_buf, width, height, video_stride);
else dmf::v210::fill_colorbars (buf, width, height, stride); else dmf::v210::fill_colorbars (video_buf, width, height, video_stride);
grain.flags = 0; video_grain.flags = 0;
grain.validSlices = grain.totalSlices; video_grain.validSlices = video_grain.totalSlices;
mxlFlowWriterCommitGrain(writer, &grain); mxlFlowWriterCommitGrain(video_writer, &video_grain);
// --- audio: sine tones, channel c = (c+1) * 1000 Hz --- // --- audio: sine tones, channel c = (c+1) * 1000 Hz ---
if (has_audio) { if (has_audio) {
@@ -125,13 +125,13 @@ class TestPatternNode : public dmf::NodeBase {
audio_index += samples_per_frame; audio_index += samples_per_frame;
} }
const uint64_t ns = mxlGetNsUntilIndex(index + 1, &video_rate); const uint64_t ns = mxlGetNsUntilIndex(video_index + 1, &video_rate);
if (ns > 0 && ns < 2'000'000'000ULL) mxlSleepForNs(ns); if (ns > 0 && ns < 2'000'000'000ULL) mxlSleepForNs(ns);
index++; video_index++;
} }
log("stopped at video_index=%llu", index); log("stopped at video_index=%llu", video_index);
mxlReleaseFlowWriter(instance(), writer); mxlReleaseFlowWriter(instance(), video_writer);
if (has_audio) mxlReleaseFlowWriter(instance(), audio_writer); if (has_audio) mxlReleaseFlowWriter(instance(), audio_writer);
} }
}; };