ryan/squoosh
1
0
Fork 0
forked from external-repos/squoosh
Code Pull Requests Activity

Code review

Browse Source
This commit is contained in:
Surma
2020-08-03 17:37:28 +01:00
committed by Ingvar Stepanyan
parent 563b558204
commit 03f33847a3
3 changed files with 10 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
codecs/avif/Makefile
View File

@@ -33,7 +33,7 @@ all: $(OUT_JS)
-o $@ \ -o $@ \
$+ $+
$(LIBAOM_OUT): $(LIBAOM_DIR)/README.md $(LIBAOM_OUT): $(LIBAOM_DIR)/CMakeLists.txt
mkdir -p $(LIBAOM_DIR)/$(LIBAOM_BUILD_DIR) && \ mkdir -p $(LIBAOM_DIR)/$(LIBAOM_BUILD_DIR) && \
cd $(LIBAOM_DIR)/$(LIBAOM_BUILD_DIR) && \ cd $(LIBAOM_DIR)/$(LIBAOM_BUILD_DIR) && \
emcmake cmake \ emcmake cmake \
@@ -50,10 +50,9 @@ $(LIBAOM_OUT): $(LIBAOM_DIR)/README.md
../ && \ ../ && \
$(MAKE) $(MAKE)
$(LIBAOM_DIR)/README.md: $(CODEC_DIR)/README.md $(LIBAOM_DIR)/CMakeLists.txt: $(CODEC_DIR)/CMakeLists.txt
mkdir -p $(LIBAOM_DIR) && \ mkdir -p $(LIBAOM_DIR)
cd $(LIBAOM_DIR) && \ curl -L $(LIBAOM_URL)/+archive/$(LIBAOM_VERSION).tar.gz | tar -xzf - -C $(LIBAOM_DIR)
curl -L $(LIBAOM_URL)/+archive/$(LIBAOM_VERSION).tar.gz | tar -xzf -
$(CODEC_OUT): $(LIBAOM_OUT) $(CODEC_OUT): $(LIBAOM_OUT)
mkdir -p $(CODEC_DIR)/$(CODEC_BUILD_DIR) && \ mkdir -p $(CODEC_DIR)/$(CODEC_BUILD_DIR) && \
@@ -65,12 +64,11 @@ $(CODEC_OUT): $(LIBAOM_OUT)
../ && \ ../ && \
$(MAKE) $(MAKE)
$(CODEC_DIR)/README.md: $(CODEC_DIR)/CMakeLists.txt:
mkdir -p $(CODEC_DIR) && \ mkdir -p $(CODEC_DIR)
cd $(CODEC_DIR) && \ curl -L $(CODEC_URL)/archive/$(CODEC_VERSION).tar.gz | tar -xzf - --strip 1 -C $(CODEC_DIR)
curl -L $(CODEC_URL)/archive/$(CODEC_VERSION).tar.gz | tar -xzf - --strip 1
clean: clean:
$(RM) $(OUT_JS) $(OUT_WASM) $(RM) $(OUT_JS) $(OUT_WASM)
cd $(CODEC_DIR)/$(CODEC_BUILD_DIR) && $(MAKE) clean $(MAKE) -C $(CODEC_DIR)/$(CODEC_BUILD_DIR) clean
cd $(LIBAOM_DIR)/$(LIBAOM_BUILD_DIR) && $(MAKE) clean $(MAKE) -C $(LIBAOM_DIR)/$(LIBAOM_BUILD_DIR) clean

12
codecs/avif/enc/avif_enc.cpp
View File

@@ -49,17 +49,7 @@ val encode(std::string buffer, int width, int height, AvifOptions options) {
avifRGBImage srcRGB; avifRGBImage srcRGB;
avifRGBImageSetDefaults(&srcRGB, image); avifRGBImageSetDefaults(&srcRGB, image);
avifRGBImageAllocatePixels(&srcRGB); avifRGBImageAllocatePixels(&srcRGB);
memcpy(srcRGB.pixels, rgba, width * height * 4);
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];
}
}
avifImageRGBToYUV(image, &srcRGB); avifImageRGBToYUV(image, &srcRGB);
avifEncoder* encoder = avifEncoderCreate(); avifEncoder* encoder = avifEncoderCreate();

BIN
codecs/avif/enc/avif_enc.wasm
View File

Binary file not shown.