-
Notifications
You must be signed in to change notification settings - Fork 206
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Implement AV2 in MinimizedImageBox (#2486)
Add avifavmminitest. Also fix 4:2:0 decoded samples mapped to 4:0:0 output image.
- Loading branch information
Showing
6 changed files
with
203 additions
and
16 deletions.
There are no files selected for viewing
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,126 @@ | ||
| // Copyright 2024 Google LLC | ||
| // SPDX-License-Identifier: BSD-2-Clause | ||
|
|
||
| #include "avif/avif.h" | ||
| #include "aviftest_helpers.h" | ||
| #include "gtest/gtest.h" | ||
|
|
||
| using testing::Combine; | ||
| using testing::Values; | ||
|
|
||
| namespace avif { | ||
| namespace { | ||
|
|
||
| class AvmMiniTest : public testing::TestWithParam< | ||
| std::tuple</*width=*/int, /*height=*/int, /*depth=*/int, | ||
| avifPixelFormat, /*alpha=*/bool>> {}; | ||
|
|
||
| TEST_P(AvmMiniTest, EncodeDecode) { | ||
| const int width = std::get<0>(GetParam()); | ||
| const int height = std::get<1>(GetParam()); | ||
| const int depth = std::get<2>(GetParam()); | ||
| const avifPixelFormat format = std::get<3>(GetParam()); | ||
| const bool alpha = std::get<4>(GetParam()); | ||
|
|
||
| ImagePtr image = testutil::CreateImage( | ||
| width, height, depth, format, alpha ? AVIF_PLANES_ALL : AVIF_PLANES_YUV); | ||
| ASSERT_NE(image, nullptr); | ||
| testutil::FillImageGradient(image.get()); | ||
|
|
||
| EncoderPtr encoder(avifEncoderCreate()); | ||
| ASSERT_NE(encoder, nullptr); | ||
| encoder->codecChoice = AVIF_CODEC_CHOICE_AVM; | ||
| encoder->headerFormat = AVIF_HEADER_REDUCED; | ||
| testutil::AvifRwData encoded; | ||
| ASSERT_EQ(avifEncoderWrite(encoder.get(), image.get(), &encoded), | ||
| AVIF_RESULT_OK); | ||
|
|
||
| ImagePtr decoded(avifImageCreateEmpty()); | ||
| ASSERT_NE(decoded, nullptr); | ||
| DecoderPtr decoder(avifDecoderCreate()); | ||
| ASSERT_NE(decoder, nullptr); | ||
| // No need to set AVIF_CODEC_CHOICE_AVM. The decoder should recognize AV2. | ||
| ASSERT_EQ(avifDecoderReadMemory(decoder.get(), decoded.get(), encoded.data, | ||
| encoded.size), | ||
| AVIF_RESULT_OK); | ||
|
|
||
| // Verify that the input and decoded images are close. | ||
| EXPECT_GT(testutil::GetPsnr(*image, *decoded), 40.0); | ||
|
|
||
| // Forcing an AV1 decoding codec should fail. | ||
| for (avifCodecChoice av1_codec : | ||
| {AVIF_CODEC_CHOICE_AOM, AVIF_CODEC_CHOICE_DAV1D, | ||
| AVIF_CODEC_CHOICE_LIBGAV1}) { | ||
| decoder->codecChoice = av1_codec; | ||
| // An error is expected because av1_codec is not enabled or because we are | ||
| // trying to decode an AV2 file with an AV1 codec. | ||
| ASSERT_EQ(avifDecoderReadMemory(decoder.get(), decoded.get(), encoded.data, | ||
| encoded.size), | ||
| avifCodecName(av1_codec, AVIF_CODEC_FLAG_CAN_DECODE) | ||
| ? AVIF_RESULT_DECODE_COLOR_FAILED | ||
| : AVIF_RESULT_NO_CODEC_AVAILABLE); | ||
| } | ||
| } | ||
|
|
||
| INSTANTIATE_TEST_SUITE_P(Basic, AvmMiniTest, | ||
| Combine(/*width=*/Values(12), /*height=*/Values(34), | ||
| /*depth=*/Values(8), | ||
| Values(AVIF_PIXEL_FORMAT_YUV400, | ||
| AVIF_PIXEL_FORMAT_YUV420, | ||
| AVIF_PIXEL_FORMAT_YUV444), | ||
| /*alpha=*/Values(false, true))); | ||
|
|
||
| INSTANTIATE_TEST_SUITE_P(Tiny, AvmMiniTest, | ||
| Combine(/*width=*/Values(1), /*height=*/Values(1), | ||
| /*depth=*/Values(8), | ||
| Values(AVIF_PIXEL_FORMAT_YUV444), | ||
| /*alpha=*/Values(false))); | ||
|
|
||
| // TODO(yguyon): Implement or fix in avm then test the following combinations. | ||
| INSTANTIATE_TEST_SUITE_P(DISABLED_Broken, AvmMiniTest, | ||
| Combine(/*width=*/Values(1), /*height=*/Values(34), | ||
| /*depth=*/Values(8, 10, 12), | ||
| Values(AVIF_PIXEL_FORMAT_YUV400, | ||
| AVIF_PIXEL_FORMAT_YUV420, | ||
| AVIF_PIXEL_FORMAT_YUV444), | ||
| /*alpha=*/Values(true))); | ||
|
|
||
| TEST(AvmMiniTest, Av1StillWorksWhenAvmIsEnabled) { | ||
| if (!testutil::Av1EncoderAvailable() || !testutil::Av1DecoderAvailable()) { | ||
| GTEST_SKIP() << "AV1 codec unavailable, skip test."; | ||
| } | ||
| // avm is the only AV2 codec, so the default codec will be an AV1 one. | ||
|
|
||
| ImagePtr image = | ||
| testutil::CreateImage(/*width=*/64, /*height=*/64, /*depth=*/8, | ||
| AVIF_PIXEL_FORMAT_YUV420, AVIF_PLANES_ALL); | ||
| ASSERT_NE(image, nullptr); | ||
| testutil::FillImageGradient(image.get()); | ||
|
|
||
| EncoderPtr encoder(avifEncoderCreate()); | ||
| ASSERT_NE(encoder, nullptr); | ||
| encoder->headerFormat = AVIF_HEADER_REDUCED; | ||
| testutil::AvifRwData encoded; | ||
| ASSERT_EQ(avifEncoderWrite(encoder.get(), image.get(), &encoded), | ||
| AVIF_RESULT_OK); | ||
|
|
||
| ImagePtr decoded(avifImageCreateEmpty()); | ||
| ASSERT_NE(decoded, nullptr); | ||
| DecoderPtr decoder(avifDecoderCreate()); | ||
| ASSERT_NE(decoder, nullptr); | ||
| ASSERT_EQ(avifDecoderReadMemory(decoder.get(), decoded.get(), encoded.data, | ||
| encoded.size), | ||
| AVIF_RESULT_OK); | ||
|
|
||
| // Verify that the input and decoded images are close. | ||
| EXPECT_GT(testutil::GetPsnr(*image, *decoded), 40.0); | ||
|
|
||
| // Forcing an AV2 decoding codec should fail. | ||
| decoder->codecChoice = AVIF_CODEC_CHOICE_AVM; | ||
| ASSERT_EQ(avifDecoderReadMemory(decoder.get(), decoded.get(), encoded.data, | ||
| encoded.size), | ||
| AVIF_RESULT_DECODE_COLOR_FAILED); | ||
| } | ||
|
|
||
| } // namespace | ||
| } // namespace avif |
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