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

Fix alpha channel in encoder

Browse Source
This commit is contained in:
Surma
2020-08-03 12:41:49 +01:00
committed by Ingvar Stepanyan
parent 15dac42a7f
commit 7893660679
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
codecs/avif/Makefile
View File

@@ -6,9 +6,9 @@ CODEC_OUT := $(addprefix $(CODEC_DIR)/, $(CODEC_OUT_RELATIVE))
CODEC_VERSION = "v0.8.0" CODEC_VERSION = "v0.8.0"
LIBAOM_RELATIVE = ./ext/aom/build.libavif/ LIBAOM_RELATIVE = ext/aom/
LIBAOM_DIR := $(addprefix $(CODEC_DIR)/, $(LIBAOM_RELATIVE)) 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_OUT := $(addprefix $(LIBAOM_DIR)/, $(LIBAOM_OUT_RELATIVE))
LIBAOM_VERSION = "v2.0.0" LIBAOM_VERSION = "v2.0.0"
@@ -35,8 +35,8 @@ all: $(OUT_JS)
$(LIBAOM_OUT): $(LIBAOM_DIR) $(LIBAOM_OUT): $(LIBAOM_DIR)
export CFLAGS="-w $(CFLAGS)" && \ export CFLAGS="-w $(CFLAGS)" && \
mkdir -p $(LIBAOM_DIR) && \ mkdir -p $(LIBAOM_DIR)/build.avif && \
cd $(LIBAOM_DIR) && \ cd $(LIBAOM_DIR)/build.avif && \
emcmake cmake \ emcmake cmake \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DENABLE_CCACHE=0 \ -DENABLE_CCACHE=0 \

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

@@ -55,7 +55,7 @@ val encode(std::string buffer, int width, int height, AvifOptions options) {
pixel[0] = rgba[pixelOffset * 4 + 0]; pixel[0] = rgba[pixelOffset * 4 + 0];
pixel[1] = rgba[pixelOffset * 4 + 1]; pixel[1] = rgba[pixelOffset * 4 + 1];
pixel[2] = rgba[pixelOffset * 4 + 2]; pixel[2] = rgba[pixelOffset * 4 + 2];
pixel[3] = rgba[pixelOffset * 4 + 0]; pixel[3] = rgba[pixelOffset * 4 + 3];
} }
} }
avifImageRGBToYUV(image, &srcRGB); avifImageRGBToYUV(image, &srcRGB);

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

Binary file not shown.

4
src/codecs/avif/decoder.ts
View File

@@ -1,5 +1,5 @@
import avif_dec, { AVIFModule } from '../../../codecs/avif_dec/avif_dec'; import avif_dec, { AVIFModule } from '../../../codecs/avif/dec/avif_dec';
import wasmUrl from '../../../codecs/avif_dec/avif_dec.wasm'; import wasmUrl from '../../../codecs/avif/dec/avif_dec.wasm';
import { initEmscriptenModule } from '../util'; import { initEmscriptenModule } from '../util';
let emscriptenModule: Promise<AVIFModule>; let emscriptenModule: Promise<AVIFModule>;

4
src/codecs/avif/encoder.ts
View File

@@ -1,5 +1,5 @@
import avif_enc, { AVIFModule } from '../../../codecs/avif_enc/avif_enc'; import avif_enc, { AVIFModule } from '../../../codecs/avif/enc/avif_enc';
import wasmUrl from '../../../codecs/avif_enc/avif_enc.wasm'; import wasmUrl from '../../../codecs/avif/enc/avif_enc.wasm';
import { EncodeOptions } from './encoder-meta'; import { EncodeOptions } from './encoder-meta';
import { initEmscriptenModule } from '../util'; import { initEmscriptenModule } from '../util';