highperfocused/bitmappery
1
0
Fork 0
mirror of https://github.com/igorski/bitmappery.git synced 2026-07-05 14:59:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed issue where certain configurations could not transfer data from WASM memory, updated filter job error handling

Browse Source
This commit is contained in:
Igor Zinken
2022-01-07 09:14:19 +01:00
parent 6b54397046
commit d1f8247a25
3 changed files with 33 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/services/render-service.js
View File

@@ -1,7 +1,7 @@
/**
* The MIT License (MIT)
*
* Igor Zinken 2020-2021 - https://www.igorski.nl
* Igor Zinken 2020-2022 - https://www.igorski.nl
*
* Permission is hereby granted, free of charge, to any person obtaining a copy of
* this software and associated documentation files (the "Software"), to deal in
@@ -106,10 +106,17 @@ export const renderEffectsForLayer = async ( layer, useCaching = true ) => {
//console.info( "reading filtered content from cache" );
imageData = cached.filterData;
} else {
imageData = await runFilterJob( cvs, { filters: layer.filters });
//console.info( "writing filtered content to cache" );
cacheToSet.filters = { ...layer.filters };
cacheToSet.filterData = imageData;
try {
imageData = await runFilterJob( cvs, { filters: layer.filters });
//console.info( "writing filtered content to cache" );
cacheToSet.filters = { ...layer.filters };
cacheToSet.filterData = imageData;
} catch ( error ) {
// TODO: communicate error ?
console.info( `Caught error "${error}" during runFilterJob()` );
renderState.pending = Math.max( 0, renderState.pending - 1 );
return;
}
}
ctx.clearRect( 0, 0, width, height );
ctx.putImageData( imageData, 0, 0 );
@@ -169,9 +176,10 @@ const runFilterJob = ( source, jobSettings ) => {
onComplete?.();
resolve( imageData );
},
error: () => {
error: optError => {
// TODO: when wasm, disable wasm mode and return to JS worker ?
onComplete?.();
reject();
reject( optError );
}
});
worker.postMessage({ cmd: wasm ? "filterWasm" : "filter", id, imageData, ...jobSettings });
@@ -184,7 +192,7 @@ function handleWorkerMessage({ data }) {
jobQueueObj?.success( data );
}
if ( data?.cmd === "error" ) {
jobQueueObj?.error( file, data?.error );
jobQueueObj?.error( data?.error );
}
};

8
src/utils/wasm-util.js
View File

@@ -43,12 +43,12 @@ export const imageDataAsFloat = ( imageData, wasmInstance, fn ) => {
// run WASM operations on float32 data
fn( memory, length );
// retrieve operation result to be returned to JS and free WASM memory
const processedImageData = wasmInstance.HEAPF32.subarray(
// retrieve operation result to be returned to JS
const processedImageData = new Uint8ClampedArray( wasmInstance.HEAPF32.subarray(
memory / sizeofFloat,
memory / sizeofFloat + length
);
wasmInstance._free( memory );
));
wasmInstance._free( memory ); // ...and free WASM memory
return processedImageData;
};

18
src/workers/filter.worker.js
View File

@@ -1,7 +1,7 @@
/**
* The MIT License (MIT)
*
* Igor Zinken 2021 - https://www.igorski.nl
* Igor Zinken 2021-2022 - https://www.igorski.nl
*
* Permission is hereby granted, free of charge, to any person obtaining a copy of
* this software and associated documentation files (the "Software"), to deal in
@@ -56,13 +56,21 @@ self.addEventListener( "message", async ({ data }) => {
// which can be set as onto an ImageData in the main application
case "filterWasm":
pixelData = renderFiltersWasm( data.imageData, data.filters );
self.postMessage({ cmd: "complete", id, pixelData });
try {
pixelData = renderFiltersWasm( data.imageData, data.filters );
self.postMessage({ cmd: "complete", id, pixelData }, [ pixelData.buffer ]);
} catch ( error ) {
self.postMessage({ cmd: "error", id, error });
}
break;
case "filter":
pixelData = renderFilters( data.imageData, data.filters );
self.postMessage({ cmd: "complete", id, pixelData });
try {
pixelData = renderFilters( data.imageData, data.filters );
self.postMessage({ cmd: "complete", id, pixelData });
} catch ( error ) {
self.postMessage({ cmd: "error", id, error });
}
break;
}
}, false );