Skip to content

Return after rejecting invalid encoder inputs #444

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
Open

Return after rejecting invalid encoder inputs #444

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
2 changes: 2 additions & 0 deletions lib/src/ultrahdr_api.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -808,6 +808,7 @@ uhdr_error_info_t uhdr_enc_set_target_display_peak_brightness(uhdr_codec_private
status.detail, sizeof status.detail,
"unexpected target display peak brightness nits %f, expects to be with in range [%f, %f]",
nits, ultrahdr::kSdrWhiteNits, ultrahdr::kPqMaxNits);
return status;
}

uhdr_encoder_private* handle = dynamic_cast<uhdr_encoder_private*>(enc);
Expand Down Expand Up @@ -1055,6 +1056,7 @@ uhdr_error_info_t uhdr_enc_set_compressed_image(uhdr_codec_private_t* enc,
snprintf(status.detail, sizeof status.detail,
"invalid intent %d, expects one of {UHDR_HDR_IMG, UHDR_SDR_IMG, UHDR_BASE_IMG}",
intent);
return status;
}

return uhdr_enc_validate_and_set_compressed_img(enc, img, intent);
Expand Down
32 changes: 32 additions & 0 deletions tests/ultrahdr_api_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#include <gtest/gtest.h>
#endif
#include <fstream>
#include <limits>
#include <vector>
#include <memory>

Expand Down Expand Up @@ -98,6 +99,37 @@ class UltraHdrApiTest : public ::testing::Test {
uhdr_compressed_image_t mSdrCompressed{};
};

TEST_F(UltraHdrApiTest, InvalidCompressedImageIntentDoesNotMutateEncoder) {
uhdr_codec_private_t* enc = uhdr_create_encoder();
ASSERT_NE(enc, nullptr);
auto* handle = dynamic_cast<uhdr_encoder_private*>(enc);
ASSERT_NE(handle, nullptr);

uhdr_error_info_t status = uhdr_enc_set_compressed_image(
enc, &mSdrCompressed, static_cast<uhdr_img_label_t>(999));

EXPECT_EQ(UHDR_CODEC_INVALID_PARAM, status.error_code) << status.detail;
EXPECT_TRUE(handle->m_compressed_images.empty());
uhdr_release_encoder(enc);
}

TEST_F(UltraHdrApiTest, InvalidTargetBrightnessDoesNotMutateEncoder) {
uhdr_codec_private_t* enc = uhdr_create_encoder();
ASSERT_NE(enc, nullptr);
auto* handle = dynamic_cast<uhdr_encoder_private*>(enc);
ASSERT_NE(handle, nullptr);

ASSERT_EQ(UHDR_CODEC_OK, uhdr_enc_set_target_display_peak_brightness(enc, 1000.0f).error_code);
ASSERT_FLOAT_EQ(1000.0f, handle->m_target_disp_max_brightness);

uhdr_error_info_t status = uhdr_enc_set_target_display_peak_brightness(
enc, std::numeric_limits<float>::quiet_NaN());

EXPECT_EQ(UHDR_CODEC_INVALID_PARAM, status.error_code) << status.detail;
EXPECT_FLOAT_EQ(1000.0f, handle->m_target_disp_max_brightness);
uhdr_release_encoder(enc);
}

// ============================================================================
// JPEG Tests (API-0 through API-4)
// ============================================================================
Expand Down
Loading