Do not allow for monochrome + identity matrix #2667
+148
−77
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
vrabaud
force-pushed
the
main
branch
5 times, most recently
from
908cbfe to
6bf6a07
Compare
y-guyon
approved these changes
Mar 6, 2025
tests/gtest/aviflosslesstest.cc
Outdated
Comment on lines
103
to
140
| // Convert to a temporary PNG and read back, to have default matrix | ||
| // coefficients. | ||
| const std::string tmp_path = testing::TempDir() + "decoded_default.png"; | ||
| ASSERT_TRUE(testutil::WriteImage(decoded.get(), tmp_path.c_str())); | ||
| const ImagePtr decoded_lossless = | ||
| ReadImageLossless(tmp_path, pixel_format, ignore_icc); | ||
|
|
||
| // Verify that the ground truth and decoded images are the same. | ||
| const ImagePtr ground_truth_lossless = | ||
| ReadImageLossless(file_path, pixel_format, ignore_icc); | ||
| const bool are_images_equal = | ||
| testutil::AreImagesEqual(*ground_truth_lossless, *decoded_lossless); | ||
|
|
||
| if (matrix_coefficients == AVIF_MATRIX_COEFFICIENTS_YCGCO) { | ||
| // AVIF_MATRIX_COEFFICIENTS_YCGCO is not a lossless transform. | ||
| ASSERT_FALSE(are_images_equal); | ||
| } else if (pixel_format == AVIF_PIXEL_FORMAT_YUV400) { | ||
| // For gray images, information is lost. | ||
| ASSERT_FALSE(are_images_equal); | ||
| } else { | ||
| ASSERT_TRUE(are_images_equal); |
There was a problem hiding this comment.
This looks unrelated to the test above because ASSERT_TRUE(testutil::AreImagesEqual(*image, *decoded));. Split into two units?
y-guyon
reviewed
Mar 6, 2025
jzern
reviewed
Mar 6, 2025
| avifPixelFormat requested_format, | ||
| avifBool ignore_icc) { | ||
| ImagePtr image(avifImageCreateEmpty()); | ||
| image->matrixCoefficients = AVIF_MATRIX_COEFFICIENTS_IDENTITY; |
There was a problem hiding this comment.
You check !image after this line.
| @@ -115,11 +115,11 @@ avifBool avifGetYUVColorSpaceInfo(const avifImage * image, avifYUVColorSpaceInfo | |||
| return AVIF_FALSE; | |||
| } | |||
|
|
|||
| // Removing 400 here would break backward behavior but would respect the spec. | |||
There was a problem hiding this comment.
But this is checked for later? What path does this break?
| return image; | ||
| } | ||
|
|
||
| class LosslessTest |
There was a problem hiding this comment.
Add a comment about what the parameters are. Tuples are convenient in tests, but aren't self documenting like structs.
| TEST_P(LosslessTest, EncodeDecodeMatrixCoefficients) { | ||
| const std::string& file_name = std::get<0>(GetParam()); | ||
| const avifMatrixCoefficients matrix_coefficients = | ||
| static_cast<avifMatrixCoefficients>(std::get<1>(GetParam())); |
There was a problem hiding this comment.
Can the test just take the enum types as params to avoid all the casting?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This fixes #2639