Rollup build

codecs/avif/dec/avif_dec.cpp

@@ -8,15 +8,10 @@ thread_local const val Uint8ClampedArray = val::global("Uint8ClampedArray");
 thread_local const val ImageData = val::global("ImageData");
 
 val decode(std::string avifimage) {
-  // point raw.data and raw.size to the contents of an .avif(s)
-  avifROData raw = {
-    .data = (uint8_t*)avifimage.c_str(),
-    .size = avifimage.length()
-  };
-
   avifImage* image = avifImageCreateEmpty();
   avifDecoder* decoder = avifDecoderCreate();
-  avifResult decodeResult = avifDecoderRead(decoder, image, &raw);
+  avifResult decodeResult =
+      avifDecoderReadMemory(decoder, image, (uint8_t*)avifimage.c_str(), avifimage.length());
   // image is an independent copy of decoded data, decoder may be destroyed here
   avifDecoderDestroy(decoder);
 
@@ -25,7 +20,8 @@ val decode(std::string avifimage) {
   if (decodeResult == AVIF_RESULT_OK) {
     // Convert to interleaved RGB(A)/BGR(A) using a libavif-allocated buffer.
     avifRGBImage rgb;
-    avifRGBImageSetDefaults(&rgb, image);  // Defaults to AVIF_RGB_FORMAT_RGBA which is what we want.
+    avifRGBImageSetDefaults(&rgb,
+                            image);  // Defaults to AVIF_RGB_FORMAT_RGBA which is what we want.
     rgb.depth = 8;  // Does not need to match image->depth. We always want 8-bit pixels.
 
     avifRGBImageAllocatePixels(&rgb);
@@ -33,7 +29,9 @@ val decode(std::string avifimage) {
 
     // We want to create a *copy* of the decoded data to be owned by the JavaScript side.
     // For that, we perform `new Uint8Array(wasmMemBuffer, wasmPtr, wasmSize).slice()`:
-    result = ImageData.new_(Uint8ClampedArray.new_(typed_memory_view(rgb.rowBytes * rgb.height, rgb.pixels)), rgb.width, rgb.height);
+    result = ImageData.new_(
+        Uint8ClampedArray.new_(typed_memory_view(rgb.rowBytes * rgb.height, rgb.pixels)), rgb.width,
+        rgb.height);
 
     // Now we can safely free the RGB pixels:
     avifRGBImageFreePixels(&rgb);