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

Adding result cache. Fixes #87. (#148)

Browse Source
This commit is contained in:
Jake Archibald
2018-09-05 08:29:17 +01:00
committed by GitHub
parent 32f6f8b941
commit 485ba174e3
2 changed files with 104 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/components/App/index.tsx
View File

@@ -6,6 +6,7 @@ import Output from '../Output';
import Options from '../Options';
import { FileDropEvent } from './custom-els/FileDrop';
import './custom-els/FileDrop';
import ResultCache from './result-cache';
import * as quantizer from '../../codecs/imagequant/quantizer';
import * as optiPNG from '../../codecs/optipng/encoder';
@@ -39,7 +40,7 @@ import { cleanMerge, cleanSet } from '../../lib/clean-modify';
type Orientation = 'horizontal' | 'vertical';
interface SourceImage {
export interface SourceImage {
file: File;
bmp: ImageBitmap;
data: ImageData;
@@ -138,7 +139,8 @@ export default class App extends Component<Props, State> {
orientation: this.widthQuery.matches ? 'horizontal' : 'vertical',
};
private snackbar?: SnackBarElement;
snackbar?: SnackBarElement;
readonly encodeCache = new ResultCache();
constructor() {
super();
@@ -254,19 +256,38 @@ export default class App extends Component<Props, State> {
const image = images[index];
let file;
try {
// Special case for identity
if (image.encoderState.type === identity.type) {
file = source.file;
} else {
if (!skipPreprocessing || !image.preprocessed) {
image.preprocessed = await preprocessImage(source, image.preprocessorState);
let preprocessed;
let bmp;
const cacheResult = this.encodeCache.match(source, image.preprocessorState, image.encoderState);
if (cacheResult) {
({ file, preprocessed, bmp } = cacheResult);
} else {
try {
// Special case for identity
if (image.encoderState.type === identity.type) {
({ file, bmp } = source);
} else {
preprocessed = (skipPreprocessing && image.preprocessed)
? image.preprocessed
: await preprocessImage(source, image.preprocessorState);
file = await compressImage(preprocessed, image.encoderState, source.file.name);
bmp = await decodeImage(file);
this.encodeCache.add({
source,
bmp,
preprocessed,
file,
encoderState: image.encoderState,
preprocessorState: image.preprocessorState,
});
}
file = await compressImage(image.preprocessed, image.encoderState, source.file.name);
} catch (err) {
this.showError(`Processing error (type=${image.encoderState.type}): ${err}`);
throw err;
}
} catch (err) {
this.showError(`Encoding error (type=${image.encoderState.type}): ${err}`);
throw err;
}
const latestImage = this.state.images[index];
@@ -275,17 +296,10 @@ export default class App extends Component<Props, State> {
return;
}
let bmp;
try {
bmp = await decodeImage(file);
} catch (err) {
this.setState({ error: `Encoding error (type=${image.encoderState.type}): ${err}` });
throw err;
}
images = cleanMerge(this.state.images, '' + index, {
images = cleanMerge(this.state.images, index, {
file,
bmp,
preprocessed,
downloadUrl: URL.createObjectURL(file),
loading: images[index].loadingCounter !== loadingCounter,
loadedCounter: loadingCounter,