Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Improve handling of animated GIF and WEBP images #8153

Merged
merged 7 commits into from
Mar 25, 2022
Merged

Improve handling of animated GIF and WEBP images #8153

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8328500
Outdent for readability and tidy
t3chguy Mar 25, 2022
d4c4bc8
Calculate GIF poster thumbnail locally if needed and wire up same sup…
t3chguy Mar 25, 2022
8a9752e
Tidy
t3chguy Mar 25, 2022
4f807cc
Properly check if GIF or WEBP are animated where we have access to th…
t3chguy Mar 25, 2022
7f6e5ca
Tweak comments
t3chguy Mar 25, 2022
32e9880
Fix for unencrypted rooms too
t3chguy Mar 25, 2022
c045294
Add gif/webp utility tests
t3chguy Mar 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/ContentMessages.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,15 +106,17 @@ interface IThumbnail {
* @param {HTMLElement} element The element to thumbnail.
* @param {number} inputWidth The width of the image in the input element.
* @param {number} inputHeight the width of the image in the input element.
* @param {String} mimeType The mimeType to save the blob as.
* @param {string} mimeType The mimeType to save the blob as.
* @param {boolean} calculateBlurhash Whether to calculate a blurhash of the given image too.
* @return {Promise} A promise that resolves with an object with an info key
* and a thumbnail key.
*/
async function createThumbnail(
export async function createThumbnail(
element: ThumbnailableElement,
inputWidth: number,
inputHeight: number,
mimeType: string,
calculateBlurhash = true,
): Promise<IThumbnail> {
let targetWidth = inputWidth;
let targetHeight = inputHeight;
Expand Down Expand Up @@ -152,7 +154,7 @@ async function createThumbnail(

const imageData = context.getImageData(0, 0, targetWidth, targetHeight);
// thumbnailPromise and blurhash promise are being awaited concurrently
const blurhash = await BlurhashEncoder.instance.getBlurhash(imageData);
const blurhash = calculateBlurhash ? await BlurhashEncoder.instance.getBlurhash(imageData) : undefined;
const thumbnail = await thumbnailPromise;

return {
Expand Down
Loading