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-gray.h | 130 ---------------------------------------------- 1 file changed, 130 deletions(-) delete mode 100644 kms++util/src/conv-gray.h (limited to 'kms++util/src/conv-gray.h') diff --git a/kms++util/src/conv-gray.h b/kms++util/src/conv-gray.h deleted file mode 100644 index 7fead46..0000000 --- a/kms++util/src/conv-gray.h +++ /dev/null @@ -1,130 +0,0 @@ -#pragma once - -#include - -#include -#include - -#include "conv-common.h" - -namespace kms -{ - -/* - * Grayscale formats - */ - -using Y8_Layout = FormatLayout>>; - -using Y10_Layout = FormatLayout, - ComponentLayout>>; - -using Y12_Layout = FormatLayout, - ComponentLayout>>; - -using Y16_Layout = FormatLayout>>; - -using XYYY2101010_Layout = FormatLayout, // Y0 - ComponentLayout, // Y1 - ComponentLayout, // Y2 - ComponentLayout ->>; - -template class Y_Writer -{ - using Plane = typename Layout::template plane<0>; - using TStorage = typename Plane::storage_type; - - static_assert(Layout::num_planes == 1); - static_assert(Plane::template component_count() >= 1); - - static constexpr bool has_padding = - Plane::template component_count(); - - static constexpr size_t y_idx = Plane::template find_pos(); - static constexpr size_t x_idx = - has_padding ? Plane::template find_pos() : 0; - - static constexpr size_t y_shift = 16 - Plane::template component_size; - - static constexpr size_t pixels_in_group = - Plane::template component_count(); - static constexpr bool is_packed_format = pixels_in_group > 1; - -public: - // Pack and write num_pixels pixels from src_line to dst_line - static void pack_line(HasIndexOperatorReturning auto&& dst_line, - HasIndexOperatorReturning auto&& src_line, - size_t num_pixels) - { - if constexpr (!is_packed_format) { - // Simple case: one Y component per storage unit - for (size_t x = 0; x < num_pixels; x++) { - const YUV16& pix = src_line[x]; - - std::array - components; - - if constexpr (has_padding) - components[x_idx] = 0; - - components[y_idx] = pix.y >> y_shift; - - dst_line[x] = Plane::pack(components); - } - } else { - write_y_samples(dst_line, src_line, num_pixels); - } - } - - static void write_pattern(IFramebuffer& fb, size_t start_y, size_t end_y, - auto&& generate_line) - { - std::vector linebuf(fb.width()); - - // View to the plane - auto view = make_strided_fb_view(fb.map(0), fb.height(), - fb.width() / pixels_in_group, - fb.stride(0)); - - for (size_t y_src = start_y; y_src <= end_y; y_src++) { - generate_line(y_src, linebuf); - - auto dst = md::submdspan(view, y_src, md::full_extent); - - pack_line(dst, linebuf, fb.width()); - } - } - -private: - template - static void write_y_samples(YBuf&& y_view, auto&& linebuf, size_t num_pixels) - { - for (size_t x_src = 0; x_src < num_pixels; 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 - Plane::template component_size)))... - }; - - y_view[x_dst] = Plane::pack(y_values); - } -}; - -} // namespace kms \ No newline at end of file -- cgit v1.2.3