Increase fastest speed to 13

Added comment and avifenc help text that libaom and rav1e range is
0-10.

Author: FrankGalligan

apps/avifenc.c

@@ -202,6 +202,7 @@ static void syntaxLong(void)
     printf("    -s,--speed S                      : Encoder speed (%d-%d, slowest-fastest, 'default' or 'd' for codec internal defaults. default speed: 6)\n",
            AVIF_SPEED_SLOWEST,
            AVIF_SPEED_FASTEST);
+    printf("                                        libaom & rav1e range 0-10\n");
     printf("\n");
     printf("Advanced options:\n");
     printf("    -j,--jobs J                       : Number of jobs (worker threads). Use \"all\" to potentially use as many cores as possible (default: all)\n");

include/avif/avif.h

@@ -115,7 +115,6 @@ typedef int avifBool;
 #define AVIF_SPEED_SLOWEST 0
 
 // Libaom and Rav1e fastest speed setting is 10, while SVT-AV1 fastest profile is 13.
-#define AVIF_SPEED_LIBAOM_RAV1E_FASTEST 10
 #define AVIF_SPEED_FASTEST 13
 
 // This value is used to indicate that an animated AVIF file has to be repeated infinitely.

tests/gtest/avif16bittest.cc

@@ -42,7 +42,7 @@ TEST_P(SampleTransformTest, Avif16bit) {
 
   EncoderPtr encoder(avifEncoderCreate());
   ASSERT_NE(encoder, nullptr);
-  encoder->speed = AVIF_SPEED_LIBAOM_RAV1E_FASTEST;
+  encoder->speed = AVIF_SPEED_FASTEST;
   encoder->quality = quality;
   encoder->qualityAlpha = quality;
   encoder->sampleTransformRecipe = recipe;

tests/gtest/avif_fuzztest_helpers.h

@@ -187,7 +187,7 @@ inline auto ArbitraryAvifEncoder() {
   const auto tile_cols_log2 = fuzztest::InRange(0, 6);
   // Fuzz only a small range of 'speed' values to avoid slowing down the fuzzer
   // too much. The main goal is to fuzz libavif, not the underlying AV1 encoder.
-  const auto speed = fuzztest::InRange(6, AVIF_SPEED_LIBAOM_RAV1E_FASTEST);
+  const auto speed = fuzztest::InRange(6, AVIF_SPEED_FASTEST);
   return fuzztest::Map(CreateAvifEncoder, codec_choice, max_threads,
                        min_quantizer, max_quantizer, min_quantizer_alpha,
                        max_quantizer_alpha, tile_rows_log2, tile_cols_log2,

tests/gtest/avifallocationtest.cc

@@ -137,7 +137,7 @@ void TestEncoding(uint32_t width, uint32_t height, uint32_t depth,
   // Try to encode.
   EncoderPtr encoder(avifEncoderCreate());
   ASSERT_NE(encoder, nullptr);
-  encoder->speed = AVIF_SPEED_LIBAOM_RAV1E_FASTEST;
+  encoder->speed = AVIF_SPEED_FASTEST;
   testutil::AvifRwData encoded_avif;
   ASSERT_EQ(avifEncoderWrite(encoder.get(), image.get(), &encoded_avif),
             expected_result);

tests/gtest/avifchangesettingtest.cc

@@ -29,7 +29,7 @@ void TestEncodeDecode(avifCodecChoice codec,
   EncoderPtr encoder(avifEncoderCreate());
   ASSERT_NE(encoder, nullptr);
   encoder->codecChoice = codec;
-  encoder->speed = AVIF_SPEED_LIBAOM_RAV1E_FASTEST;
+  encoder->speed = AVIF_SPEED_FASTEST;
   encoder->timescale = 1;
 
   for (const auto& option : init_cs_options) {
@@ -134,7 +134,7 @@ TEST(ChangeSettingTest, UnchangeableSetting) {
   EncoderPtr encoder(avifEncoderCreate());
   ASSERT_NE(encoder, nullptr);
   encoder->codecChoice = AVIF_CODEC_CHOICE_AOM;
-  encoder->speed = AVIF_SPEED_LIBAOM_RAV1E_FASTEST;
+  encoder->speed = AVIF_SPEED_FASTEST;
   encoder->timescale = 1;
   ASSERT_EQ(encoder->repetitionCount, AVIF_REPETITION_COUNT_INFINITE);
   encoder->minQuantizer = 63;
@@ -178,7 +178,7 @@ TEST(ChangeSettingTest, UnchangeableImageColorRange) {
   EncoderPtr encoder(avifEncoderCreate());
   ASSERT_NE(encoder, nullptr);
   encoder->codecChoice = AVIF_CODEC_CHOICE_AOM;
-  encoder->speed = AVIF_SPEED_LIBAOM_RAV1E_FASTEST;
+  encoder->speed = AVIF_SPEED_FASTEST;
   encoder->timescale = 1;
   ASSERT_EQ(encoder->repetitionCount, AVIF_REPETITION_COUNT_INFINITE);
   encoder->quality = AVIF_QUALITY_WORST;
@@ -215,7 +215,7 @@ TEST(ChangeSettingTest, UnchangeableImageChromaSamplePosition) {
   EncoderPtr encoder(avifEncoderCreate());
   ASSERT_NE(encoder, nullptr);
   encoder->codecChoice = AVIF_CODEC_CHOICE_AOM;
-  encoder->speed = AVIF_SPEED_LIBAOM_RAV1E_FASTEST;
+  encoder->speed = AVIF_SPEED_FASTEST;
   encoder->timescale = 1;
   ASSERT_EQ(encoder->repetitionCount, AVIF_REPETITION_COUNT_INFINITE);
   encoder->quality = AVIF_QUALITY_WORST;

tests/gtest/avifgridapitest.cc

@@ -37,7 +37,7 @@ avifResult EncodeDecodeGrid(const std::vector<std::vector<Cell>>& cell_rows,
   if (!encoder) {
     return AVIF_RESULT_OUT_OF_MEMORY;
   }
-  encoder->speed = AVIF_SPEED_LIBAOM_RAV1E_FASTEST;
+  encoder->speed = AVIF_SPEED_FASTEST;
   encoder->quality = AVIF_QUALITY_LOSSLESS;
   encoder->qualityAlpha = AVIF_QUALITY_LOSSLESS;
   // cell_image_ptrs exists only to match the libavif API.
@@ -239,7 +239,7 @@ TEST(GridApiTest, SameMatrixCoefficients) {
 
   EncoderPtr encoder(avifEncoderCreate());
   ASSERT_NE(encoder, nullptr);
-  encoder->speed = AVIF_SPEED_LIBAOM_RAV1E_FASTEST;
+  encoder->speed = AVIF_SPEED_FASTEST;
   const avifImage* cell_image_ptrs[2] = {cell_0.get(), cell_1.get()};
   ASSERT_EQ(
       avifEncoderAddImageGrid(encoder.get(), /*gridCols=*/2, /*gridRows=*/1,
@@ -268,7 +268,7 @@ TEST(GridApiTest, DifferentMatrixCoefficients) {
 
   EncoderPtr encoder(avifEncoderCreate());
   ASSERT_NE(encoder, nullptr);
-  encoder->speed = AVIF_SPEED_LIBAOM_RAV1E_FASTEST;
+  encoder->speed = AVIF_SPEED_FASTEST;
   // Encoding should fail.
   const avifImage* cell_image_ptrs[2] = {cell_0.get(), cell_1.get()};
   ASSERT_EQ(

tests/gtest/avifincrtest_helpers.cc

@@ -231,7 +231,7 @@ void EncodeAsGrid(const avifImage& image, uint32_t grid_cols,
 
   EncoderPtr encoder(avifEncoderCreate());
   ASSERT_NE(encoder, nullptr);
-  encoder->speed = AVIF_SPEED_LIBAOM_RAV1E_FASTEST;
+  encoder->speed = AVIF_SPEED_FASTEST;
   // Just here to match libavif API.
   std::vector<avifImage*> cell_image_ptrs(cell_images.size());
   for (size_t i = 0; i < cell_images.size(); ++i) {

tests/gtest/avifiostatstest.cc

@@ -31,7 +31,7 @@ bool GetIoStatsFromEncode(avifIOStats& encoder_io_stats, int quality,
 
   EncoderPtr encoder(avifEncoderCreate());
   AVIF_CHECK(encoder != nullptr);
-  encoder->speed = AVIF_SPEED_LIBAOM_RAV1E_FASTEST;
+  encoder->speed = AVIF_SPEED_FASTEST;
   encoder->quality = quality;
   encoder->qualityAlpha = qualityAlpha;
   for (int frame = 0; frame < num_frames; ++frame) {

tests/gtest/aviflosslesstest.cc

@@ -54,7 +54,7 @@ TEST(BasicTest, EncodeDecodeMatrixCoefficients) {
       // Encode.
       EncoderPtr encoder(avifEncoderCreate());
       ASSERT_NE(encoder, nullptr);
-      encoder->speed = AVIF_SPEED_LIBAOM_RAV1E_FASTEST;
+      encoder->speed = AVIF_SPEED_FASTEST;
       encoder->quality = AVIF_QUALITY_LOSSLESS;
       encoder->qualityAlpha = AVIF_QUALITY_LOSSLESS;
       testutil::AvifRwData encoded;