From 789366067986f66d790e5ec2192fb25f3d0e4b1f Mon Sep 17 00:00:00 2001
From: Surma <surma@surma.dev>
Date: Mon, 3 Aug 2020 12:41:49 +0100
Subject: [PATCH] Fix alpha channel in encoder

---
 codecs/avif/Makefile          |   8 ++++----
 codecs/avif/enc/avif_enc.cpp  |   2 +-
 codecs/avif/enc/avif_enc.wasm | Bin 1658397 -> 1658401 bytes
 src/codecs/avif/decoder.ts    |   4 ++--
 src/codecs/avif/encoder.ts    |   4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/codecs/avif/Makefile b/codecs/avif/Makefile
index 50e65254..e21b1003 100644
--- a/codecs/avif/Makefile
+++ b/codecs/avif/Makefile
@@ -6,9 +6,9 @@ CODEC_OUT := $(addprefix $(CODEC_DIR)/, $(CODEC_OUT_RELATIVE))
 
 CODEC_VERSION = "v0.8.0"
 
-LIBAOM_RELATIVE = ./ext/aom/build.libavif/
+LIBAOM_RELATIVE = ext/aom/
 LIBAOM_DIR := $(addprefix $(CODEC_DIR)/, $(LIBAOM_RELATIVE))
-LIBAOM_OUT_RELATIVE = ./libaom.a
+LIBAOM_OUT_RELATIVE = build.libavif/libaom.a
 LIBAOM_OUT := $(addprefix $(LIBAOM_DIR)/, $(LIBAOM_OUT_RELATIVE))
 
 LIBAOM_VERSION = "v2.0.0"
@@ -35,8 +35,8 @@ all: $(OUT_JS)
 
 $(LIBAOM_OUT): $(LIBAOM_DIR)
 	export CFLAGS="-w $(CFLAGS)" && \
-	mkdir -p $(LIBAOM_DIR) && \
-	cd $(LIBAOM_DIR) && \
+	mkdir -p $(LIBAOM_DIR)/build.avif && \
+	cd $(LIBAOM_DIR)/build.avif && \
 	emcmake cmake \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DENABLE_CCACHE=0 \
diff --git a/codecs/avif/enc/avif_enc.cpp b/codecs/avif/enc/avif_enc.cpp
index 02476d48..7a199eef 100644
--- a/codecs/avif/enc/avif_enc.cpp
+++ b/codecs/avif/enc/avif_enc.cpp
@@ -55,7 +55,7 @@ val encode(std::string buffer, int width, int height, AvifOptions options) {
       pixel[0] = rgba[pixelOffset * 4 + 0];
       pixel[1] = rgba[pixelOffset * 4 + 1];
       pixel[2] = rgba[pixelOffset * 4 + 2];
-      pixel[3] = rgba[pixelOffset * 4 + 0];
+      pixel[3] = rgba[pixelOffset * 4 + 3];
     }
   }
   avifImageRGBToYUV(image, &srcRGB);
diff --git a/codecs/avif/enc/avif_enc.wasm b/codecs/avif/enc/avif_enc.wasm
index bed24fd8b6e8e20128c848a66c660b1c9c31354d..62ac555c4d891cf6cd5fe1b4ea4a692274a90957 100644
GIT binary patch
delta 141
zcmbO`Cw1YR)D12MjE|dL4cc7|7=f4xh?#+y1&CRJm~FeO0sGO1EE|{^xu^39acr7?
zNQgs|on3*;k+~?V{f!U@5OV@C7Z7s;F%J;)0x=&D^8>K}5DNma5D*Iku?P^00<jnn
OivzL5_BTS3hSmT$pfO$m

delta 138
zcmWm4ArgW>7=Y1PKwT7Z{Q=Qxv#r_c9)*(-I06L&oxo727S7>t1CHQFc<r@K@o9?w
zZPl-IwsKa%gO30kY)5Bz(;RfZit1SO;N4CA75z}AT0|qn9tT7?BE|{pIYW>jMTQG<
KT*pOj&(|NY_ArV7

diff --git a/src/codecs/avif/decoder.ts b/src/codecs/avif/decoder.ts
index 3f22a37f..5bbdd8b1 100644
--- a/src/codecs/avif/decoder.ts
+++ b/src/codecs/avif/decoder.ts
@@ -1,5 +1,5 @@
-import avif_dec, { AVIFModule } from '../../../codecs/avif_dec/avif_dec';
-import wasmUrl from '../../../codecs/avif_dec/avif_dec.wasm';
+import avif_dec, { AVIFModule } from '../../../codecs/avif/dec/avif_dec';
+import wasmUrl from '../../../codecs/avif/dec/avif_dec.wasm';
 import { initEmscriptenModule } from '../util';
 
 let emscriptenModule: Promise<AVIFModule>;
diff --git a/src/codecs/avif/encoder.ts b/src/codecs/avif/encoder.ts
index 790d525a..d17f2f9c 100644
--- a/src/codecs/avif/encoder.ts
+++ b/src/codecs/avif/encoder.ts
@@ -1,5 +1,5 @@
-import avif_enc, { AVIFModule } from '../../../codecs/avif_enc/avif_enc';
-import wasmUrl from '../../../codecs/avif_enc/avif_enc.wasm';
+import avif_enc, { AVIFModule } from '../../../codecs/avif/enc/avif_enc';
+import wasmUrl from '../../../codecs/avif/enc/avif_enc.wasm';
 import { EncodeOptions } from './encoder-meta';
 import { initEmscriptenModule } from '../util';