Skip to content

jpegr: initialize legacy gain map output #445

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gregbenz wants to merge 1 commit into
base: main
Choose a base branch
from
+50 −13
Open

jpegr: initialize legacy gain map output #445

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions lib/src/jpegr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2837,21 +2837,21 @@ status_t JpegR::decodeJPEGR(jr_compressed_ptr jpegr_image_ptr, jr_uncompressed_p
output.planes[UHDR_PLANE_V] = nullptr;
output.stride[UHDR_PLANE_V] = 0;

uhdr_raw_image_t output_gm;
uhdr_raw_image_t output_gm{};
if (gainmap_image_ptr) {
output.fmt =
output_gm.fmt =
gainmap_image.numComponents == 1 ? UHDR_IMG_FMT_8bppYCbCr400 : UHDR_IMG_FMT_24bppRGB888;
output.cg = UHDR_CG_UNSPECIFIED;
output.ct = UHDR_CT_UNSPECIFIED;
output.range = UHDR_CR_UNSPECIFIED;
output.w = gainmap_image.width;
output.h = gainmap_image.height;
output.planes[UHDR_PLANE_PACKED] = gainmap_image_ptr->data;
output.stride[UHDR_PLANE_PACKED] = gainmap_image.width;
output.planes[UHDR_PLANE_U] = nullptr;
output.stride[UHDR_PLANE_U] = 0;
output.planes[UHDR_PLANE_V] = nullptr;
output.stride[UHDR_PLANE_V] = 0;
output_gm.cg = UHDR_CG_UNSPECIFIED;
output_gm.ct = UHDR_CT_UNSPECIFIED;
output_gm.range = UHDR_CR_UNSPECIFIED;
output_gm.w = gainmap_image.width;
output_gm.h = gainmap_image.height;
output_gm.planes[UHDR_PLANE_PACKED] = gainmap_image_ptr->data;
output_gm.stride[UHDR_PLANE_PACKED] = gainmap_image.width;
output_gm.planes[UHDR_PLANE_U] = nullptr;
output_gm.stride[UHDR_PLANE_U] = 0;
output_gm.planes[UHDR_PLANE_V] = nullptr;
output_gm.stride[UHDR_PLANE_V] = 0;
}

uhdr_gainmap_metadata_ext_t meta;
Expand Down
37 changes: 37 additions & 0 deletions tests/jpegr_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1417,6 +1417,43 @@ TEST(JpegRTest, DecodeAPIWithInvalidArgs) {
<< "fail, API allows invalid output format";
}

TEST(JpegRTest, DecodeLegacyApiWithGainMapOutputKeepsPrimaryDescriptor) {
UhdrUnCompressedStructWrapper rawImg(kImageWidth, kImageHeight, YCbCr_p010);
ASSERT_TRUE(rawImg.setImageColorGamut(ULTRAHDR_COLORGAMUT_BT2100));
ASSERT_TRUE(rawImg.allocateMemory());
ASSERT_TRUE(rawImg.loadRawResource(kYCbCrP010FileName));

UhdrCompressedStructWrapper jpgImg(kImageWidth, kImageHeight);
ASSERT_TRUE(jpgImg.allocateMemory());

JpegR uHdrLib;
ASSERT_EQ(JPEGR_NO_ERROR,
uHdrLib.encodeJPEGR(rawImg.getImageHandle(), ULTRAHDR_TF_HLG,
jpgImg.getImageHandle(), kQuality, nullptr));

std::vector<uint8_t> primaryData(kImageWidth * kImageHeight * 8);
jpegr_uncompressed_struct primaryImage{};
primaryImage.data = primaryData.data();

std::vector<uint8_t> gainmapData(kImageWidth * kImageHeight * 3);
jpegr_uncompressed_struct gainmapImage{};
gainmapImage.data = gainmapData.data();

ultrahdr_metadata_struct metadata{};
ASSERT_EQ(JPEGR_NO_ERROR,
uHdrLib.decodeJPEGR(jpgImg.getImageHandle(), &primaryImage, FLT_MAX, nullptr,
ULTRAHDR_OUTPUT_HDR_LINEAR, &gainmapImage, &metadata));

EXPECT_EQ(kImageWidth, primaryImage.width);
EXPECT_EQ(kImageHeight, primaryImage.height);
EXPECT_EQ(UHDR_IMG_FMT_64bppRGBAHalfFloat, primaryImage.pixelFormat);
EXPECT_GT(gainmapImage.width, 0u);
EXPECT_GT(gainmapImage.height, 0u);
EXPECT_LE(gainmapImage.width, kImageWidth);
EXPECT_LE(gainmapImage.height, kImageHeight);
EXPECT_GT(metadata.hdrCapacityMax, 1.0f);
}

class TestJpegR : public JpegR {
public:
using JpegR::applyGainMap;
Expand Down
Loading