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

Add test to JXL decoder

Browse Source
This commit is contained in:
Surma
2020-02-06 13:59:53 -08:00
committed by Ingvar Stepanyan
parent de1eb76226
commit 3697635bae
6 changed files with 44 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
codecs/jxl_dec/build.sh
View File

@@ -28,7 +28,7 @@ test -n "$SKIP_LIBJXL" || (
mkdir -p build mkdir -p build
cd build cd build
emcmake cmake ../ emcmake cmake ../
emmake make jpegxl-static brunslidec-static brunslicommon-static brunslienc-static emmake make jpegxl-static
) )
echo "=============================================" echo "============================================="

6
codecs/jxl_dec/example.html
View File

@@ -1,7 +1,7 @@
<!doctype html> <!doctype html>
<script src='avif_dec.js'></script> <script src='jxl_dec.js'></script>
<script> <script>
const Module = avif_dec(); const Module = jxl_dec();
async function loadFile(src) { async function loadFile(src) {
const resp = await fetch(src); const resp = await fetch(src);
@@ -9,7 +9,7 @@
} }
Module.onRuntimeInitialized = async _ => { Module.onRuntimeInitialized = async _ => {
const image = await loadFile('../example.avif'); const image = await loadFile('../example.jxl');
const result = Module.decode(image); const result = Module.decode(image);
console.log(result.width, result.height, result.buffer); console.log(result.width, result.height, result.buffer);
const imageData = new ImageData(new Uint8ClampedArray(result.buffer), result.width, result.height); const imageData = new ImageData(new Uint8ClampedArray(result.buffer), result.width, result.height);

BIN
codecs/jxl_dec/example.jxl
View File

Binary file not shown.

43
codecs/jxl_dec/jxl_dec.cpp
View File

@@ -14,7 +14,18 @@ public:
RawImage(val b, int w, int h) : buffer(b), width(w), height(h) {} RawImage(val b, int w, int h) : buffer(b), width(w), height(h) {}
}; };
val decode(std::string data) { uint8_t clamp(float v, float min, float max) {
if (v < min) {
return min;
}
if (v > max) {
return max;
}
return v;
}
uint8_t *result;
RawImage decode(std::string data) {
jxl::Span<const uint8_t> compressed((uint8_t *)data.c_str(), data.length()); jxl::Span<const uint8_t> compressed((uint8_t *)data.c_str(), data.length());
jxl::DecompressParams dparams; jxl::DecompressParams dparams;
// jxl::ThreadPool pool; // jxl::ThreadPool pool;
@@ -22,11 +33,34 @@ val decode(std::string data) {
jxl::AuxOut aux_out; jxl::AuxOut aux_out;
if (!DecodeFile(dparams, compressed, &io, &aux_out, NULL)) { if (!DecodeFile(dparams, compressed, &io, &aux_out, NULL)) {
printf("FAIL\n"); return RawImage(val::null(), -1, -1);
} }
printf("YAY\n"); jxl::ImageBundle *main = &io.Main();
return val(1); if (!main->HasColor()) {
return RawImage(val::null(), -1, -1);
} }
const jxl::Image3F *buffer = &main->color();
int width = buffer->xsize();
int height = buffer->ysize();
result = new uint8_t[width * height * 4];
for (int y = 0; y < height; y++) {
const float *red = buffer->PlaneRow(0, y);
const float *green = buffer->PlaneRow(1, y);
const float *blue = buffer->PlaneRow(2, y);
for (int x = 0; x < width; x++) {
int pixelOffset = width * y + x;
result[pixelOffset * 4 + 0] = clamp(red[x], 0, 255);
result[pixelOffset * 4 + 1] = clamp(green[x], 0, 255);
result[pixelOffset * 4 + 2] = clamp(blue[x], 0, 255);
result[pixelOffset * 4 + 3] = 255;
}
}
return RawImage(val(typed_memory_view(width * height * 4, result)), width,
height);
}
void free_result() { delete result; }
EMSCRIPTEN_BINDINGS(my_module) { EMSCRIPTEN_BINDINGS(my_module) {
class_<RawImage>("RawImage") class_<RawImage>("RawImage")
@@ -35,4 +69,5 @@ EMSCRIPTEN_BINDINGS(my_module) {
.property("height", &RawImage::height); .property("height", &RawImage::height);
function("decode", &decode); function("decode", &decode);
function("free_result", &free_result);
} }

2
codecs/jxl_dec/jxl_dec.js
View File

File diff suppressed because one or more lines are too long

BIN
codecs/jxl_dec/jxl_dec.wasm
View File

Binary file not shown.