diff --git a/CHANGELOG.md b/CHANGELOG.md index 6e6e4f9663..117d69e454 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,6 +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. +* 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 da5b659528..bd29d89e40 100644 --- a/apps/avifenc.c +++ b/apps/avifenc.c @@ -201,7 +201,8 @@ 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"); printf(" -j,--jobs J : Number of jobs (worker threads). Use \"all\" to potentially use as many cores as possible (default: all)\n"); @@ -1734,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/src/codec_svt.c b/src/codec_svt.c index 193f244a1e..55192d26df 100644 --- a/src/codec_svt.c +++ b/src/codec_svt.c @@ -160,11 +160,11 @@ static avifResult svtCodecEncodeImage(avifCodec * codec, } if (encoder->speed != AVIF_SPEED_DEFAULT) { #if SVT_AV1_CHECK_VERSION(0, 9, 0) - svt_config->enc_mode = (int8_t)encoder->speed; + int speed = AVIF_CLAMP(encoder->speed, 0, 13); #else int speed = AVIF_CLAMP(encoder->speed, 0, 8); - svt_config->enc_mode = (int8_t)speed; #endif + svt_config->enc_mode = (int8_t)speed; } if (color_format == EB_YUV422 || image->depth > 10) {