From 2a5d3758b6816da20831815e5daf4735e1e9b1b3 Mon Sep 17 00:00:00 2001 From: JohannesItten Date: Fri, 3 Jul 2026 09:59:36 +0300 Subject: [PATCH] refactor: align testpattern naming with ndiin/ndiout MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- nodes/testpattern/main.cpp | 72 +++++++++++++++++++------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/nodes/testpattern/main.cpp b/nodes/testpattern/main.cpp index a8f43e7..83f44b4 100644 --- a/nodes/testpattern/main.cpp +++ b/nodes/testpattern/main.cpp @@ -21,37 +21,37 @@ class TestPatternNode : public dmf::NodeBase { log("flow=%s %dx%d @ %d/%d fps pattern=%s", flow_id.c_str(), width, height, fps_num, fps_den, pattern.c_str()); - mxlFlowWriter writer{}; - mxlFlowConfigInfo cfg_info{}; + mxlFlowWriter video_writer{}; + mxlFlowConfigInfo video_cfg{}; bool created = false; - mxlStatus st = mxlCreateFlowWriter( + mxlStatus vst = mxlCreateFlowWriter( instance(), dmf::make_video_flow_def(flow_id, node_id(), width, height, fps_num, fps_den).c_str(), - nullptr, &writer, &cfg_info, &created); - if (st != MXL_STATUS_OK) { log("video mxlCreateFlowWriter failed (status=%d)", st); return; } + nullptr, &video_writer, &video_cfg, &created); + 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", - stride, stride * static_cast(height), cfg_info.discrete.grainCount); + video_stride, video_stride * static_cast(height), video_cfg.discrete.grainCount); // --- audio flow (optional) --- mxlFlowWriter audio_writer{}; mxlFlowConfigInfo audio_cfg{}; - int sample_rate = 48000; - int channels = 2; - bool has_audio = config().contains("audio_flow_id"); + int sample_rate = 48000; + int channels = 2; + bool has_audio = config().contains("audio_flow_id"); if (has_audio) { - const auto audio_info = config().at("audio_flow_id"); - const auto audio_id = audio_info.at("id").get(); - sample_rate = audio_info.value("sample_rate", 48000); - channels = audio_info.value("channels", 2); + const auto audio_flow_info = config().at("audio_flow_id"); + const auto audio_flow_id = audio_flow_info.at("id").get(); + sample_rate = audio_flow_info.value("sample_rate", 48000); + 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( 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(), nullptr, &audio_writer, &audio_cfg, &created); if (ast != MXL_STATUS_OK) { @@ -72,29 +72,29 @@ class TestPatternNode : public dmf::NodeBase { // -18 dBFS broadcast reference level const float amplitude = static_cast(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; - log("start video_index=%llu", index); + log("start video_index=%llu", video_index); while (dmf::g_running.load(std::memory_order_relaxed)) { // --- video grain --- - mxlGrainInfo grain{}; - uint8_t* buf = nullptr; - st = mxlFlowWriterOpenGrain(writer, index, &grain, &buf); - if (st != MXL_STATUS_OK) { - log("OpenGrain failed (status=%d), skipping index=%llu", st, index); - index++; + mxlGrainInfo video_grain{}; + uint8_t* video_buf = nullptr; + vst = mxlFlowWriterOpenGrain(video_writer, video_index, &video_grain, &video_buf); + if (vst != MXL_STATUS_OK) { + log("OpenGrain failed (status=%d), skipping index=%llu", vst, video_index); + video_index++; continue; } - if (pattern == "bars") dmf::v210::fill_colorbars(buf, width, height, stride); - else if (pattern == "ire") dmf::v210::fill_ire_ramp (buf, width, height, stride); - else if (pattern == "black") dmf::v210::fill_black (buf, width, height, stride); - else if (pattern == "white") dmf::v210::fill_white (buf, width, height, stride); - else dmf::v210::fill_colorbars (buf, width, height, stride); - grain.flags = 0; - grain.validSlices = grain.totalSlices; - mxlFlowWriterCommitGrain(writer, &grain); + if (pattern == "bars") dmf::v210::fill_colorbars(video_buf, width, height, video_stride); + else if (pattern == "ire") dmf::v210::fill_ire_ramp (video_buf, width, height, video_stride); + else if (pattern == "black") dmf::v210::fill_black (video_buf, width, height, video_stride); + else if (pattern == "white") dmf::v210::fill_white (video_buf, width, height, video_stride); + else dmf::v210::fill_colorbars (video_buf, width, height, video_stride); + video_grain.flags = 0; + video_grain.validSlices = video_grain.totalSlices; + mxlFlowWriterCommitGrain(video_writer, &video_grain); // --- audio: sine tones, channel c = (c+1) * 1000 Hz --- if (has_audio) { @@ -125,13 +125,13 @@ class TestPatternNode : public dmf::NodeBase { 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); - index++; + video_index++; } - log("stopped at video_index=%llu", index); - mxlReleaseFlowWriter(instance(), writer); + log("stopped at video_index=%llu", video_index); + mxlReleaseFlowWriter(instance(), video_writer); if (has_audio) mxlReleaseFlowWriter(instance(), audio_writer); } };