From 549c347d6feb2e94a810a720c97a8bf0f57317a1 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Mon, 4 May 2026 16:19:04 +0300 Subject: kms++util: Replace test-pattern generator with pixpat Switch draw_test_pattern() to call libpixpat (linked statically into libkms++util.so) instead of the in-tree pattern generator. Pixpat covers every pattern (kmstest, smpte, solid colors) and every pixel format the previous generator handled, so behavior is unchanged for all callers. Drop the now-unused machinery: conv.h and conv-*.h template writers, color16.h (RGB16/YUV16 plus conversions), the *_old / _single / _multi declarations that had no definitions or callers, and the c_draw_test_pattern C ABI which had no callers anywhere in the tree. RecStandard and ColorRange move from color16.h directly into kms++util.h, since they are still part of the public TestPatternOptions struct. --- kms++util/src/conv-yuv-semiplanar.h | 214 ------------------------------------ 1 file changed, 214 deletions(-) delete mode 100644 kms++util/src/conv-yuv-semiplanar.h (limited to 'kms++util/src/conv-yuv-semiplanar.h') diff --git a/kms++util/src/conv-yuv-semiplanar.h b/kms++util/src/conv-yuv-semiplanar.h deleted file mode 100644 index 81117c1..0000000 --- a/kms++util/src/conv-yuv-semiplanar.h +++ /dev/null @@ -1,214 +0,0 @@ -#pragma once - -#include - -#include -#include - -#include "conv-common.h" - -namespace kms -{ - -/* Semiplanar YUV */ - -template -struct NV12_Family_Layout - : public FormatLayout< - PlaneLayout - >, - PlaneLayout, - ComponentLayout - > - > -{ - static constexpr size_t h_sub = HSub; - static constexpr size_t v_sub = VSub; -}; - -using NV12_Layout = NV12_Family_Layout; -using NV21_Layout = NV12_Family_Layout; - -using NV16_Layout = NV12_Family_Layout; -using NV61_Layout = NV12_Family_Layout; - -template -struct P030_Family_Layout - : public FormatLayout< - PlaneLayout, - ComponentLayout, - ComponentLayout - >, - PlaneLayout, - ComponentLayout, - ComponentLayout, - ComponentLayout, - ComponentLayout, - ComponentLayout - > - > -{ - static constexpr size_t h_sub = HSub; - static constexpr size_t v_sub = VSub; -}; - -using P030_Layout = P030_Family_Layout<2, 2>; -using P230_Layout = P030_Family_Layout<2, 1>; - -template -struct SubsampleHelper { - template static constexpr auto subsample(const View& view, size_t group_idx) - { - uint32_t sum = 0; - - static_for<0, HSub>([&](auto x) { sum += view(0, group_idx + x); }); - - if constexpr (VSub > 1) { - static_for<1, VSub>([&](auto y) { - static_for<0, HSub>([&](auto x) { sum += view(y, group_idx + x); }); - }); - } - - return sum / (HSub * VSub); - } -}; - -template -class YUVSemiPlanarWriter -{ - static_assert(Layout::num_planes == 2); - - static constexpr size_t h_sub = Layout::h_sub; - static constexpr size_t v_sub = Layout::v_sub; - - using YLayout = typename Layout::template plane<0>; - using UVLayout = typename Layout::template plane<1>; - - using TY = typename YLayout::storage_type; - using TCrCb = typename UVLayout::storage_type; - - static constexpr size_t pixels_in_group = YLayout::template component_count(); - static_assert(pixels_in_group == UVLayout::template component_count()); - static_assert(pixels_in_group == UVLayout::template component_count()); - -public: - static void write_pattern(IFramebuffer& fb, size_t start_y, size_t end_y, - auto&& generate_line) - { - assert(start_y % v_sub == 0); - assert((end_y + 1) % v_sub == 0); - if (fb.width() % pixels_in_group != 0) - throw std::invalid_argument("FB width doesn't align to pixel format"); - - // Line buffers - std::vector linebuf_storage(fb.width() * v_sub); - auto linebuf = md::mdspan(linebuf_storage.data(), v_sub, fb.width()); - - // Views to the planes - auto y_view = make_strided_fb_view(fb.map(0), fb.height(), - fb.width() / pixels_in_group, fb.stride(0)); - - auto uv_view = make_strided_fb_view(fb.map(1), fb.height() / v_sub, - fb.width() / pixels_in_group / h_sub, - fb.stride(1)); - - for (size_t y_src = start_y; y_src <= end_y; y_src++) { - size_t y_offset = y_src % v_sub; - - if (y_offset == 0) { - // Fill line buffers - for (size_t y_off = 0; y_off < v_sub; y_off++) { - auto line = md::submdspan(linebuf, y_off, md::full_extent); - std::span span(line.data_handle(), line.size()); - generate_line(y_src + y_off, span); - } - } - - // Write Y values from the line buffer - write_y_samples(md::submdspan(y_view, y_src, md::full_extent), - md::submdspan(linebuf, y_offset, md::full_extent)); - - if (y_offset == 0) { - // Write UV values from the line buffers - write_uv_samples(uv_view, linebuf, y_src); - } - } - } - -private: - - template - static void write_y_samples(YBuf&& y_view, auto&& linebuf) - { - for (size_t x_src = 0; x_src < linebuf.extent(1); x_src += pixels_in_group) { - auto x_dst = x_src / pixels_in_group; - - write_y_group(y_view, linebuf, x_src, x_dst, - std::make_index_sequence{}); - } - } - - template - static void write_y_group(YBuf&& y_view, auto&& linebuf, size_t x_src, - size_t x_dst, std::index_sequence) - { - std::array y_values{ - static_cast((linebuf(x_src + I).y >> (16 - YLayout::template component_size)))... - }; - - y_view(x_dst) = YLayout::pack(y_values); - } - - template - static void write_uv_samples(UVBuf& uv_view, auto& linebuf, size_t y_src) - { - for (size_t x_src = 0; x_src < linebuf.extent(1); x_src += pixels_in_group * h_sub) { - const size_t y_offset = 0; - auto y_dst = (y_src + y_offset) / v_sub; - auto x_dst = x_src / (pixels_in_group * h_sub); - - auto group_view = md::submdspan(linebuf, std::tuple(y_offset, y_offset + v_sub), - std::tuple(x_src, x_src + h_sub * pixels_in_group)); - - write_uv_group(uv_view, group_view, y_dst, x_dst, - std::make_index_sequence{}); - } - } - - template - static void write_uv_group(UVBuf& uv_view, auto& group_view, size_t y_dst, size_t x_dst, - std::index_sequence) - { - std::array uv_values; - - ( - [&]() { - constexpr size_t group_idx = i * h_sub; - - constexpr size_t u_idx = UVLayout::template find_nth_pos(i); - constexpr size_t v_idx = UVLayout::template find_nth_pos(i); - - auto u = SubsampleHelper::subsample( - [&group_view](size_t y, size_t x) { return group_view(y, x).u; }, - group_idx); - - auto v = SubsampleHelper::subsample( - [&group_view](size_t y, size_t x) { return group_view(y, x).v; }, - group_idx); - - uv_values[u_idx] = - u >> (16 - UVLayout::template component_size); - uv_values[v_idx] = - v >> (16 - UVLayout::template component_size); - }.template operator()(), - ...); - - uv_view(y_dst, x_dst) = UVLayout::pack(uv_values); - } -}; - -} // namespace kms -- cgit v1.2.3