From 03f33847a3ab9e56dc887e2a5f538d7ae7ae762e Mon Sep 17 00:00:00 2001
From: Surma <surma@surma.dev>
Date: Mon, 3 Aug 2020 17:37:28 +0100
Subject: [PATCH] Code review

---
 codecs/avif/Makefile          |  20 +++++++++-----------
 codecs/avif/enc/avif_enc.cpp  |  12 +-----------
 codecs/avif/enc/avif_enc.wasm | Bin 1658551 -> 1658406 bytes
 3 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/codecs/avif/Makefile b/codecs/avif/Makefile
index 7fa2a96c..e4d9604c 100644
--- a/codecs/avif/Makefile
+++ b/codecs/avif/Makefile
@@ -33,7 +33,7 @@ all: $(OUT_JS)
 		-o $@ \
 		$+
 
-$(LIBAOM_OUT): $(LIBAOM_DIR)/README.md
+$(LIBAOM_OUT): $(LIBAOM_DIR)/CMakeLists.txt
 	mkdir -p $(LIBAOM_DIR)/$(LIBAOM_BUILD_DIR) && \
 	cd $(LIBAOM_DIR)/$(LIBAOM_BUILD_DIR) && \
 	emcmake cmake \
@@ -50,10 +50,9 @@ $(LIBAOM_OUT): $(LIBAOM_DIR)/README.md
 		../ && \
 	$(MAKE) 
 
-$(LIBAOM_DIR)/README.md: $(CODEC_DIR)/README.md
-	mkdir -p $(LIBAOM_DIR) && \
-	cd $(LIBAOM_DIR) && \
-	curl -L $(LIBAOM_URL)/+archive/$(LIBAOM_VERSION).tar.gz | tar -xzf -
+$(LIBAOM_DIR)/CMakeLists.txt: $(CODEC_DIR)/CMakeLists.txt
+	mkdir -p $(LIBAOM_DIR)
+	curl -L $(LIBAOM_URL)/+archive/$(LIBAOM_VERSION).tar.gz | tar -xzf - -C $(LIBAOM_DIR)
 
 $(CODEC_OUT): $(LIBAOM_OUT)
 	mkdir -p $(CODEC_DIR)/$(CODEC_BUILD_DIR) && \
@@ -65,12 +64,11 @@ $(CODEC_OUT): $(LIBAOM_OUT)
 		../ && \
 	$(MAKE)
 
-$(CODEC_DIR)/README.md:
-	mkdir -p $(CODEC_DIR) && \
-	cd $(CODEC_DIR) && \
-	curl -L $(CODEC_URL)/archive/$(CODEC_VERSION).tar.gz | tar -xzf - --strip 1 
+$(CODEC_DIR)/CMakeLists.txt:
+	mkdir -p $(CODEC_DIR)
+	curl -L $(CODEC_URL)/archive/$(CODEC_VERSION).tar.gz | tar -xzf - --strip 1 -C $(CODEC_DIR)
 
 clean:
 	$(RM) $(OUT_JS) $(OUT_WASM)
-	cd $(CODEC_DIR)/$(CODEC_BUILD_DIR) && $(MAKE) clean
-	cd $(LIBAOM_DIR)/$(LIBAOM_BUILD_DIR) && $(MAKE) clean
+	$(MAKE) -C $(CODEC_DIR)/$(CODEC_BUILD_DIR) clean
+	$(MAKE) -C $(LIBAOM_DIR)/$(LIBAOM_BUILD_DIR) clean
diff --git a/codecs/avif/enc/avif_enc.cpp b/codecs/avif/enc/avif_enc.cpp
index e506ec0b..ec2dc90d 100644
--- a/codecs/avif/enc/avif_enc.cpp
+++ b/codecs/avif/enc/avif_enc.cpp
@@ -49,17 +49,7 @@ val encode(std::string buffer, int width, int height, AvifOptions options) {
   avifRGBImage srcRGB;
   avifRGBImageSetDefaults(&srcRGB, image);
   avifRGBImageAllocatePixels(&srcRGB);
-
-  for (int y = 0; y < height; y++) {
-    for (int x = 0; x < width; x++) {
-      int pixelOffset = y * width + x;
-      uint8_t* pixel = &srcRGB.pixels[(4 * x) + (srcRGB.rowBytes * y)];
-      pixel[0] = rgba[pixelOffset * 4 + 0];
-      pixel[1] = rgba[pixelOffset * 4 + 1];
-      pixel[2] = rgba[pixelOffset * 4 + 2];
-      pixel[3] = rgba[pixelOffset * 4 + 3];
-    }
-  }
+  memcpy(srcRGB.pixels, rgba, width * height * 4);
   avifImageRGBToYUV(image, &srcRGB);
 
   avifEncoder* encoder = avifEncoderCreate();
diff --git a/codecs/avif/enc/avif_enc.wasm b/codecs/avif/enc/avif_enc.wasm
index 04d2fa897ab221cf72395184688ba148759485f1..e1439c310f4d0488c01ce84e4c482b34c8b14c07 100644
GIT binary patch
delta 154
zcmWN=s}9027=Y3A--UADTJEY6fv88}aD-GNmrNje1H?RL2JAGhk3+&U@Bn-#Iq_9>
z&+2{l@_F2YZ-Q48CQO+zkHPoyZ~7A@?ZxP$Qf+6nE3>WaoO0rl>p^aX-!!$=>~p{&
YM;vp)DGQb~w48Cy1(#gK+OALgKVA|krvLx|

delta 300
zcmXZUJx&8L5Qbroy~#T3{Q)QZb>pR>2$E}P;sPZVDB7Abjg=~*r$8tNphyF4YPvm2
zdQQL*_?B$($a+1a*?+FuuhsX`%ioW;#%~)>AVEO_0~ofAPlrFrdqQUSZ1sZD-QH?`
zRe>Ip84qrxccy!$E@v5N;R-e5;sG<wX6;Irtk<pz!Vv~JmrOyv#8{6wW#THL>MY(0
zaVG?KpIM;Iv8iv_x9nSOu8#`}$0*jsa$X2ySa+pa{nz$jHH;tw1345>LIo#q3KqsN
QfipOV3%G0#_Uh^W4~_vtv;Y7A