ee4f9ef82c
This is a small prerequisite for moving decoded YUV frames from ImmutableBitmap into Media::VideoFrame. Once the frame owns the planes directly, CPU consumers and the Skia upload path will share the same YUVData object. Those consumers need different representations. Skia expects high bit depth YUVA pixmaps to be full-range 16-bit samples, while CPU conversion paths must see the decoder-native samples and the original bit depth. Keep YUVData in decoder-native form, and make the Skia expansion a temporary copy owned by SkYUVAPixmaps. Add a regression test that checks 10-bit pixmaps are expanded for Skia without mutating the source planes or changing YUVData::to_bitmap() output.
85 lines
2.9 KiB
C++
85 lines
2.9 KiB
C++
/*
|
|
* Copyright (c) 2026, Aliaksandr Kalenik <kalenik.aliaksandr@gmail.com>
|
|
*
|
|
* SPDX-License-Identifier: BSD-2-Clause
|
|
*/
|
|
|
|
#include <AK/Array.h>
|
|
#include <LibGfx/Bitmap.h>
|
|
#include <LibGfx/YUVData.h>
|
|
#include <LibTest/TestCase.h>
|
|
|
|
#include <core/SkYUVAPixmaps.h>
|
|
|
|
static u16 expand_10_bit_sample_to_full_16_bit_range(u16 sample)
|
|
{
|
|
return static_cast<u16>((sample << 6) | (sample >> 4));
|
|
}
|
|
|
|
template<size_t Size>
|
|
static void write_samples(Bytes plane, Array<u16, Size> const& samples)
|
|
{
|
|
auto* destination = reinterpret_cast<u16*>(plane.data());
|
|
for (size_t i = 0; i < Size; i++)
|
|
destination[i] = samples[i];
|
|
}
|
|
|
|
template<size_t Size>
|
|
static void expect_samples(Bytes plane, Array<u16, Size> const& expected)
|
|
{
|
|
auto const* samples = reinterpret_cast<u16 const*>(plane.data());
|
|
for (size_t i = 0; i < Size; i++)
|
|
EXPECT_EQ(samples[i], expected[i]);
|
|
}
|
|
|
|
template<size_t Size>
|
|
static void expect_expanded_pixmap_samples(SkPixmap const& plane, Array<u16, Size> const& native_samples, int width)
|
|
{
|
|
for (size_t i = 0; i < Size; i++) {
|
|
auto x = static_cast<int>(i % static_cast<size_t>(width));
|
|
auto y = static_cast<int>(i / static_cast<size_t>(width));
|
|
EXPECT_EQ(*plane.addr16(x, y), expand_10_bit_sample_to_full_16_bit_range(native_samples[i]));
|
|
}
|
|
}
|
|
|
|
TEST_CASE(high_bit_depth_pixmaps_expand_without_mutating_native_samples)
|
|
{
|
|
auto const cicp = Media::CodingIndependentCodePoints {
|
|
Media::ColorPrimaries::BT709,
|
|
Media::TransferCharacteristics::BT709,
|
|
Media::MatrixCoefficients::BT709,
|
|
Media::VideoFullRangeFlag::Full,
|
|
};
|
|
auto yuv_data = TRY_OR_FAIL(Gfx::YUVData::create({ 2, 2 }, 10, Media::Subsampling { false, false }, cicp));
|
|
|
|
Array<u16, 4> const y_samples { 0, 341, 682, 1023 };
|
|
Array<u16, 4> const u_samples { 512, 513, 514, 515 };
|
|
Array<u16, 4> const v_samples { 508, 509, 510, 511 };
|
|
|
|
write_samples(yuv_data->y_data(), y_samples);
|
|
write_samples(yuv_data->u_data(), u_samples);
|
|
write_samples(yuv_data->v_data(), v_samples);
|
|
|
|
auto bitmap_before = TRY_OR_FAIL(yuv_data->to_bitmap());
|
|
|
|
auto pixmaps = yuv_data->make_pixmaps();
|
|
EXPECT(pixmaps.isValid());
|
|
EXPECT(pixmaps.ownsStorage());
|
|
EXPECT(pixmaps.dataType() == SkYUVAPixmapInfo::DataType::kUnorm16);
|
|
EXPECT_EQ(pixmaps.numPlanes(), 3);
|
|
|
|
expect_expanded_pixmap_samples(pixmaps.plane(0), y_samples, 2);
|
|
expect_expanded_pixmap_samples(pixmaps.plane(1), u_samples, 2);
|
|
expect_expanded_pixmap_samples(pixmaps.plane(2), v_samples, 2);
|
|
|
|
EXPECT_EQ(yuv_data->bit_depth(), 10);
|
|
expect_samples(yuv_data->y_data(), y_samples);
|
|
expect_samples(yuv_data->u_data(), u_samples);
|
|
expect_samples(yuv_data->v_data(), v_samples);
|
|
|
|
auto bitmap_after = TRY_OR_FAIL(yuv_data->to_bitmap());
|
|
for (int y = 0; y < yuv_data->size().height(); y++) {
|
|
for (int x = 0; x < yuv_data->size().width(); x++)
|
|
EXPECT_EQ(bitmap_after->get_pixel(x, y), bitmap_before->get_pixel(x, y));
|
|
}
|
|
}
|