Additional AVIF options (GoogleChromeLabs#987)

* Separate colour & alpha options for AVIF

* Adding broken noise synthesis

* Build files

* Updating build

* Changing speed default

* Remove old comment

* Better speed default

Author: jakearchibald

codecs/avif/Makefile

@@ -1,9 +1,9 @@
-# Tracking the version in google3/third_party/libavif
-CODEC_URL = https://github.com/AOMediaCodec/libavif/archive/f56df6d4c99928af484634af65cdbd62bac2dd6e.tar.gz
+# libavif and libaom versions are from
+# https://docs.google.com/document/d/1wEEA5rRU7wT54k41u3qyZIZHDCJArIMzLuzsrLAwaK8/edit
+CODEC_URL = https://github.com/AOMediaCodec/libavif/archive/d37ef74127986184500e571bf1f9793cc0bdef50.tar.gz
 CODEC_PACKAGE = node_modules/libavif.tar.gz
 
-# Tracking the version in google3/third_party/libaom
-LIBAOM_URL = https://aomedia.googlesource.com/aom/+archive/4a8e276e3e0ef3c76083f3975d5caa85bc9593ce.tar.gz
+LIBAOM_URL = https://aomedia.googlesource.com/aom/+archive/0a5da45c7f942908974f5ab8e107c9fa82048ae7.tar.gz
 LIBAOM_PACKAGE = node_modules/libaom.tar.gz
 
 export CODEC_DIR = node_modules/libavif

codecs/avif/dec/avif_dec.wasm

@@ -10,7 +10,8 @@ struct AvifOptions {
   // 0 = lossless
   // 63 = worst quality
   int cqLevel;
-  int minQuantizerAlpha;
+  // As above, but -1 means 'use cqLevel'
+  int cqAlphaLevel;
   // [0 - 6]
   // Creates 2^n tiles in that dimension
   int tileRowsLog2;
@@ -30,6 +31,8 @@ struct AvifOptions {
   int sharpness;
   // Target ssim rather than psnr
   bool targetSsim;
+  // 0-50
+  int denoiseLevel;
 };
 
 thread_local const val Uint8Array = val::global("Uint8Array");
@@ -54,8 +57,9 @@ val encode(std::string buffer, int width, int height, AvifOptions options) {
   }
 
   bool lossless = options.cqLevel == AVIF_QUANTIZER_LOSSLESS &&
-                  options.minQuantizerAlpha == AVIF_QUANTIZER_LOSSLESS &&
+                  options.cqAlphaLevel <= AVIF_QUANTIZER_LOSSLESS &&
                   format == AVIF_PIXEL_FORMAT_YUV444;
+
   avifImage* image = avifImageCreate(width, height, depth, format);
 
   if (lossless) {
@@ -82,20 +86,28 @@ val encode(std::string buffer, int width, int height, AvifOptions options) {
   } else {
     encoder->minQuantizer = AVIF_QUANTIZER_BEST_QUALITY;
     encoder->maxQuantizer = AVIF_QUANTIZER_WORST_QUALITY;
-    encoder->minQuantizerAlpha = options.minQuantizerAlpha;
+    encoder->minQuantizerAlpha = AVIF_QUANTIZER_BEST_QUALITY;
     encoder->maxQuantizerAlpha = AVIF_QUANTIZER_WORST_QUALITY;
     avifEncoderSetCodecSpecificOption(encoder, "end-usage", "q");
     avifEncoderSetCodecSpecificOption(encoder, "cq-level", std::to_string(options.cqLevel).c_str());
     avifEncoderSetCodecSpecificOption(encoder, "sharpness",
                                       std::to_string(options.sharpness).c_str());
 
+    if (options.cqAlphaLevel != -1) {
+      avifEncoderSetCodecSpecificOption(encoder, "alpha:cq-level",
+                                        std::to_string(options.cqAlphaLevel).c_str());
+    }
+
     if (options.targetSsim) {
       avifEncoderSetCodecSpecificOption(encoder, "tune", "ssim");
     }
 
     if (options.chromaDeltaQ) {
       avifEncoderSetCodecSpecificOption(encoder, "enable-chroma-deltaq", "1");
     }
+
+    avifEncoderSetCodecSpecificOption(encoder, "color:denoise-noise-level",
+                                      std::to_string(options.denoiseLevel).c_str());
   }
 
   encoder->maxThreads = emscripten_num_logical_cores();
@@ -118,13 +130,14 @@ val encode(std::string buffer, int width, int height, AvifOptions options) {
 EMSCRIPTEN_BINDINGS(my_module) {
   value_object<AvifOptions>("AvifOptions")
       .field("cqLevel", &AvifOptions::cqLevel)
-      .field("minQuantizerAlpha", &AvifOptions::minQuantizerAlpha)
+      .field("cqAlphaLevel", &AvifOptions::cqAlphaLevel)
       .field("tileRowsLog2", &AvifOptions::tileRowsLog2)
       .field("tileColsLog2", &AvifOptions::tileColsLog2)
       .field("speed", &AvifOptions::speed)
       .field("chromaDeltaQ", &AvifOptions::chromaDeltaQ)
       .field("sharpness", &AvifOptions::sharpness)
       .field("targetSsim", &AvifOptions::targetSsim)
+      .field("denoiseLevel", &AvifOptions::denoiseLevel)
       .field("subsample", &AvifOptions::subsample);
 
   function("encode", &encode);

codecs/avif/dec/avif_node_dec.wasm

@@ -1,6 +1,7 @@
 export interface EncodeOptions {
   cqLevel: number;
-  minQuantizerAlpha: number;
+  denoiseLevel: number;
+  cqAlphaLevel: number;
   tileRowsLog2: number;
   tileColsLog2: number;
   speed: number;