external-repos/squoosh
1
0
Fork 1
mirror of https://github.com/GoogleChromeLabs/squoosh.git synced 2025-11-17 19:19:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Memory view rather than pointers (#144). Part of #141.

Browse Source 
* Returning an object seems to work well

* This doesn't work

* This does!

* Better cast?

* Updating usage in Squoosh
This commit is contained in:
Jake Archibald
2018-08-21 09:27:04 +01:00
committed by GitHub
parent 1ae65dd4a1
commit 8006a1a5e7
14 changed files with 62 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
codecs/mozjpeg_enc/mozjpeg_enc.cpp
View File

@@ -1,10 +1,10 @@
#include "emscripten.h"
#include <emscripten/bind.h>
#include <emscripten/val.h>
#include <stdlib.h>
#include <inttypes.h>
#include <stdio.h>
#include <setjmp.h>
#include <string.h>
#include <emscripten/bind.h>
#include "config.h"
#include "jpeglib.h"
#include "cdjpeg.h"
@@ -47,17 +47,10 @@ int version() {
return version;
}
int create_buffer(int width, int height) {
return (int) malloc(width * height * 4 * sizeof(uint8_t));
}
uint8_t* last_result;
void destroy_buffer(int p) {
free((uint8_t*) p);
}
int result[2];
void encode(int image_in, int image_width, int image_height, MozJpegOptions opts) {
uint8_t* image_buffer = (uint8_t*) image_in;
val encode(std::string image_in, int image_width, int image_height, MozJpegOptions opts) {
uint8_t* image_buffer = (uint8_t*) image_in.c_str();
// The code below is basically the `write_JPEG_file` function from
// https://github.com/mozilla/mozjpeg/blob/master/example.c
@@ -191,25 +184,17 @@ void encode(int image_in, int image_width, int image_height, MozJpegOptions opts
jpeg_finish_compress(&cinfo);
/* Step 7: release JPEG compression object */
result[0] = (int)output;
result[1] = size;
/* This is an important step since it will release a good deal of memory. */
jpeg_destroy_compress(&cinfo);
last_result = output;
/* And we're done! */
return val(typed_memory_view(size, output));
}
void free_result() {
free((void*)result[0]); // not sure if this is right with mozjpeg
}
int get_result_pointer() {
return result[0];
}
int get_result_size() {
return result[1];
free(last_result); // not sure if this is right with mozjpeg
}
EMSCRIPTEN_BINDINGS(my_module) {
@@ -229,10 +214,6 @@ EMSCRIPTEN_BINDINGS(my_module) {
;
function("version", &version);
function("create_buffer", &create_buffer, allow_raw_pointers());
function("destroy_buffer", &destroy_buffer, allow_raw_pointers());
function("encode", &encode, allow_raw_pointers());
function("encode", &encode);
function("free_result", &free_result);
function("get_result_pointer", &get_result_pointer, allow_raw_pointers());
function("get_result_size", &get_result_size, allow_raw_pointers());
}