mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Remove autoOrientJPEG and consolidate downscaling logic

Browse source
This commit is contained in:
trevor-signal 2024-03-06 16:49:21 -05:00 • committed by GitHub
parent 3eed6cb350
commit 09b5e6ef50
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
10 changed files with 105 additions and 144 deletions
Download patch file Download diff file Expand all files Collapse all files

22
ts/util/scaleImageToLevel.ts
View file

@ -108,12 +108,17 @@ async function getCanvasBlobAsJPEG(
return canvasToBlob(canvas, IMAGE_JPEG, quality);
}
export async function scaleImageToLevel(
fileOrBlobOrURL: File | Blob | string,
contentType: MIMEType,
size: number,
sendAsHighQuality?: boolean
): Promise<{
export async function scaleImageToLevel({
fileOrBlobOrURL,
contentType,
size,
highQuality,
}: {
fileOrBlobOrURL: File | Blob | string;
contentType: MIMEType;
size: number;
highQuality: boolean | null;
}): Promise<{
blob: Blob;
contentType: MIMEType;
}> {
@ -134,16 +139,13 @@ export async function scaleImageToLevel(
throw error;
}
const level = sendAsHighQuality
? MediaQualityLevels.Three
: getMediaQualityLevel();
const level = highQuality ? MediaQualityLevels.Three : getMediaQualityLevel();
const {
maxDimensions,
quality,
size: targetSize,
thresholdSize,
} = MEDIA_QUALITY_LEVEL_DATA.get(level) || DEFAULT_LEVEL_DATA;
if (size <= thresholdSize) {
// Always encode through canvas as a temporary fix for a library bug
const blob: Blob = await canvasToBlob(data.image, contentType);