Skip to content
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

Jump to bottom

parameterize box test #2792

Merged
merged 4 commits into from
Sep 14, 2023
Merged

parameterize box test #2792

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8104656
parametrize box test
mo271 Sep 13, 2023
35602e9
remove colons before namespace
mo271 Sep 13, 2023
f075951
use JXL_GTEST
mo271 Sep 13, 2023
9e6165c
add second argument
mo271 Sep 14, 2023
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
155 changes: 87 additions & 68 deletions lib/jxl/encode_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,10 @@
#include <jxl/encode.h>
#include <jxl/encode_cxx.h>

#include <cstddef>
#include <cstdio>
#include <ostream>
#include <string>
#include <vector>

#include "jxl/types.h"
Expand Down Expand Up @@ -1219,84 +1221,88 @@ TEST(EncodeTest, CroppedFrameTest) {
EXPECT_EQ(true, seen_frame);
}

TEST(EncodeTest, JXL_BOXES_TEST(BoxTest)) {
struct EncodeBoxTest : public testing::TestWithParam<std::tuple<bool, size_t>> {
};

TEST_P(EncodeBoxTest, JXL_BOXES_TEST(BoxTest)) {
// Test with uncompressed boxes and with brob boxes
for (int compress_box = 0; compress_box <= 1; ++compress_box) {
// Tests adding two metadata boxes with the encoder: an exif box before the
// image frame, and an xml box after the image frame. Then verifies the
// decoder can decode them, they are in the expected place, and have the
// correct content after decoding.
JxlEncoderPtr enc = JxlEncoderMake(nullptr);
EXPECT_NE(nullptr, enc.get());
bool compress_box = std::get<0>(GetParam());
size_t xml_box_size = std::get<1>(GetParam());
// TODO(firsching): use xml_box_size
(void)xml_box_size;
// Tests adding two metadata boxes with the encoder: an exif box before the
// image frame, and an xml box after the image frame. Then verifies the
// decoder can decode them, they are in the expected place, and have the
// correct content after decoding.
JxlEncoderPtr enc = JxlEncoderMake(nullptr);
EXPECT_NE(nullptr, enc.get());

EXPECT_EQ(JXL_ENC_SUCCESS, JxlEncoderUseBoxes(enc.get()));
EXPECT_EQ(JXL_ENC_SUCCESS, JxlEncoderUseBoxes(enc.get()));

JxlEncoderFrameSettings* frame_settings =
JxlEncoderFrameSettingsCreate(enc.get(), NULL);
size_t xsize = 50;
size_t ysize = 17;
JxlPixelFormat pixel_format = {4, JXL_TYPE_UINT16, JXL_BIG_ENDIAN, 0};
std::vector<uint8_t> pixels =
jxl::test::GetSomeTestImage(xsize, ysize, 4, 0);
JxlBasicInfo basic_info;
jxl::test::JxlBasicInfoSetFromPixelFormat(&basic_info, &pixel_format);
basic_info.xsize = xsize;
basic_info.ysize = ysize;
basic_info.uses_original_profile = false;
EXPECT_EQ(JXL_ENC_SUCCESS, JxlEncoderSetCodestreamLevel(enc.get(), 10));
EXPECT_EQ(JXL_ENC_SUCCESS, JxlEncoderSetBasicInfo(enc.get(), &basic_info));
JxlColorEncoding color_encoding;
JxlColorEncodingSetToSRGB(&color_encoding,
/*is_gray=*/false);
EXPECT_EQ(JXL_ENC_SUCCESS,
JxlEncoderSetColorEncoding(enc.get(), &color_encoding));
JxlEncoderFrameSettings* frame_settings =
JxlEncoderFrameSettingsCreate(enc.get(), NULL);
size_t xsize = 50;
size_t ysize = 17;
JxlPixelFormat pixel_format = {4, JXL_TYPE_UINT16, JXL_BIG_ENDIAN, 0};
std::vector<uint8_t> pixels = jxl::test::GetSomeTestImage(xsize, ysize, 4, 0);
JxlBasicInfo basic_info;
jxl::test::JxlBasicInfoSetFromPixelFormat(&basic_info, &pixel_format);
basic_info.xsize = xsize;
basic_info.ysize = ysize;
basic_info.uses_original_profile = false;
EXPECT_EQ(JXL_ENC_SUCCESS, JxlEncoderSetCodestreamLevel(enc.get(), 10));
EXPECT_EQ(JXL_ENC_SUCCESS, JxlEncoderSetBasicInfo(enc.get(), &basic_info));
JxlColorEncoding color_encoding;
JxlColorEncodingSetToSRGB(&color_encoding,
/*is_gray=*/false);
EXPECT_EQ(JXL_ENC_SUCCESS,
JxlEncoderSetColorEncoding(enc.get(), &color_encoding));

std::vector<uint8_t> compressed = std::vector<uint8_t>(64);
uint8_t* next_out = compressed.data();
size_t avail_out = compressed.size() - (next_out - compressed.data());

// Add an early metadata box. Also add a valid 4-byte TIFF offset header
// before the fake exif data of these box contents.
constexpr const char* exif_test_string = "\0\0\0\0exif test data";
const uint8_t* exif_data =
reinterpret_cast<const uint8_t*>(exif_test_string);
// Skip the 4 zeroes for strlen
const size_t exif_size = 4 + strlen(exif_test_string + 4);
JxlEncoderAddBox(enc.get(), "Exif", exif_data, exif_size, compress_box);

// Write to output
ProcessEncoder(enc.get(), compressed, next_out, avail_out);
std::vector<uint8_t> compressed = std::vector<uint8_t>(64);
uint8_t* next_out = compressed.data();
size_t avail_out = compressed.size() - (next_out - compressed.data());

// Add image frame
EXPECT_EQ(JXL_ENC_SUCCESS,
JxlEncoderAddImageFrame(frame_settings, &pixel_format,
pixels.data(), pixels.size()));
// Indicate this is the last frame
JxlEncoderCloseFrames(enc.get());
// Add an early metadata box. Also add a valid 4-byte TIFF offset header
// before the fake exif data of these box contents.
constexpr const char* exif_test_string = "\0\0\0\0exif test data";
const uint8_t* exif_data = reinterpret_cast<const uint8_t*>(exif_test_string);
// Skip the 4 zeroes for strlen
const size_t exif_size = 4 + strlen(exif_test_string + 4);
JxlEncoderAddBox(enc.get(), "Exif", exif_data, exif_size, compress_box);

// Write to output
ProcessEncoder(enc.get(), compressed, next_out, avail_out);
// Write to output
ProcessEncoder(enc.get(), compressed, next_out, avail_out);

// Add a late metadata box
constexpr const char* xml_test_string = "<some random xml data>";
const uint8_t* xml_data = reinterpret_cast<const uint8_t*>(xml_test_string);
size_t xml_size = strlen(xml_test_string);
JxlEncoderAddBox(enc.get(), "XML ", xml_data, xml_size, compress_box);
// Add image frame
EXPECT_EQ(JXL_ENC_SUCCESS,
JxlEncoderAddImageFrame(frame_settings, &pixel_format,
pixels.data(), pixels.size()));
// Indicate this is the last frame
JxlEncoderCloseFrames(enc.get());

// Indicate this is the last box
JxlEncoderCloseBoxes(enc.get());
// Write to output
ProcessEncoder(enc.get(), compressed, next_out, avail_out);

// Write to output
ProcessEncoder(enc.get(), compressed, next_out, avail_out);
// Add a late metadata box
constexpr const char* xml_test_string = "<some random xml data>";
const uint8_t* xml_data = reinterpret_cast<const uint8_t*>(xml_test_string);
size_t xml_size = strlen(xml_test_string);
JxlEncoderAddBox(enc.get(), "XML ", xml_data, xml_size, compress_box);

// Decode to verify the boxes, we don't decode to pixels, only the boxes.
JxlDecoderPtr dec = JxlDecoderMake(nullptr);
EXPECT_NE(nullptr, dec.get());
// Indicate this is the last box
JxlEncoderCloseBoxes(enc.get());

if (compress_box) {
EXPECT_EQ(JXL_DEC_SUCCESS,
JxlDecoderSetDecompressBoxes(dec.get(), JXL_TRUE));
}
// Write to output
ProcessEncoder(enc.get(), compressed, next_out, avail_out);

// Decode to verify the boxes, we don't decode to pixels, only the boxes.
JxlDecoderPtr dec = JxlDecoderMake(nullptr);
EXPECT_NE(nullptr, dec.get());

if (compress_box) {
EXPECT_EQ(JXL_DEC_SUCCESS,
JxlDecoderSetDecompressBoxes(dec.get(), JXL_TRUE));
}

EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSubscribeEvents(
dec.get(), JXL_DEC_FRAME | JXL_DEC_BOX));
Expand Down Expand Up @@ -1338,11 +1344,24 @@ TEST(EncodeTest, JXL_BOXES_TEST(BoxTest)) {
FAIL(); // unexpected status
}
}

EXPECT_EQ(0, memcmp(exif_data, dec_exif_box.data(), exif_size));
EXPECT_EQ(0, memcmp(xml_data, dec_xml_box.data(), xml_size));
}
}

std::string nameBoxTest(
const ::testing::TestParamInfo<std::tuple<bool, size_t>>& info) {
return (std::get<0>(info.param) ? "C" : "Unc") + std::string("ompressed") +
"_BoxSize_" + std::to_string((std::get<1>(info.param)));
}

JXL_GTEST_INSTANTIATE_TEST_SUITE_P(
EncodeBoxParamsTest, EncodeBoxTest,
testing::Combine(testing::Values(false, true),
testing::Values(256,
jxl::kLargeBoxContentSizeThreshold + 77)),
nameBoxTest);

TEST(EncodeTest, JXL_TRANSCODE_JPEG_TEST(JPEGFrameTest)) {
TEST_LIBJPEG_SUPPORT();
for (int skip_basic_info = 0; skip_basic_info < 2; skip_basic_info++) {
Expand Down