diff --git a/CHANGELOG.md b/CHANGELOG.md index ad2c605245..117d69e454 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,7 +30,7 @@ The changes are relative to the previous release, unless the baseline is specifi avifGainMapMetadataDouble structs. * Add avif(Un)SignedFraction structs and avifDoubleTo(Un)SignedFraction utility functions. -* In avif.h, changed "AVIF_SPEED_FASTEST" value to 13 from 10. +* Change codec_svt.c to clamp from 0 to 13. ## [1.1.1] - 2024-07-30 diff --git a/apps/avifenc.c b/apps/avifenc.c index 9bccf284bf..bd29d89e40 100644 --- a/apps/avifenc.c +++ b/apps/avifenc.c @@ -201,7 +201,7 @@ static void syntaxLong(void) AVIF_QUALITY_LOSSLESS); 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); + 13); printf(" libaom range 0-9 & rav1e range 0-10\n"); printf("\n"); printf("Advanced options:\n"); @@ -1735,9 +1735,6 @@ int main(int argc, char * argv[]) settings.speed = AVIF_SPEED_DEFAULT; } else { settings.speed = atoi(arg); - if (settings.speed > AVIF_SPEED_FASTEST) { - settings.speed = AVIF_SPEED_FASTEST; - } if (settings.speed < AVIF_SPEED_SLOWEST) { settings.speed = AVIF_SPEED_SLOWEST; } diff --git a/include/avif/avif.h b/include/avif/avif.h index 0642c166b2..f3d87a8ea9 100644 --- a/include/avif/avif.h +++ b/include/avif/avif.h @@ -113,9 +113,7 @@ typedef int avifBool; #define AVIF_SPEED_DEFAULT -1 #define AVIF_SPEED_SLOWEST 0 - -// Libaom and Rav1e fastest speed setting is 10, while SVT-AV1 fastest profile is 13. -#define AVIF_SPEED_FASTEST 13 +#define AVIF_SPEED_FASTEST 10 // This value is used to indicate that an animated AVIF file has to be repeated infinitely. #define AVIF_REPETITION_COUNT_INFINITE -1 diff --git a/src/codec_svt.c b/src/codec_svt.c index cf7382309b..55192d26df 100644 --- a/src/codec_svt.c +++ b/src/codec_svt.c @@ -160,7 +160,7 @@ static avifResult svtCodecEncodeImage(avifCodec * codec, } if (encoder->speed != AVIF_SPEED_DEFAULT) { #if SVT_AV1_CHECK_VERSION(0, 9, 0) - int speed = AVIF_CLAMP(encoder->speed, 0, AVIF_SPEED_FASTEST); + int speed = AVIF_CLAMP(encoder->speed, 0, 13); #else int speed = AVIF_CLAMP(encoder->speed, 0, 8); #endif