Skip to content

Commit

Permalink
It only affects 32-bit
Browse files Browse the repository at this point in the history
  • Loading branch information
mnvr committed Jul 22, 2024
1 parent d20e880 commit 4f91374
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 11 deletions.
17 changes: 9 additions & 8 deletions docs/docs/photos/troubleshooting/thumbnails.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,12 @@ canvas.
## Desktop

The only known case where thumbnails might be missing on desktop is when
uploading **videos** during a Google Takeout or folder sync on **Intel macOS**
machines. This is because the bundled ffmpeg that we use does not work with
Rosetta. For images, we are able to fallback to other mechanisms for generating
the thumbnails, but for videos because of their potentially huge size, the app
doesn't try the fallback to avoid running out of memory.
uploading **videos** during a Google Takeout or folder sync on **32-bit Intel
macOS** machines. This is because the bundled ffmpeg that we use does not work
on this 32-bit Intel macOS. In such cases, for images we are able to fallback to
other mechanisms for generating the thumbnails, but for videos because of their
potentially huge size, the app doesn't try the fallback to avoid running out of
memory.

In such cases, you will need to use the following workaround:

Expand All @@ -40,7 +41,7 @@ In such cases, you will need to use the following workaround:
`/Applications/ente.app/Contents/Resources/app.asar.unpacked/node_modules/ffmpeg-static/ffmpeg`.

Even without the workaround, thumbnail generation during video uploads via the
normal folder selection or drag and drop will work fine (since in this case we
normal folder selection or drag and drop should work fine (since in this case we
have access to the video's data directly without reading it from a zip and can
thus use the fallback).

Expand All @@ -51,5 +52,5 @@ You will need to upload the affected files again.

Ente skips over files that have already been uploaded, so you can drag and drop
the original folder or zip again after removing the files without thumbnails
(and fixing the issue on web or adding the workaround on Intel macOS), and it'll
only upload the files that are necessary.
(and fixing the issue on web or adding the workaround on 32-bit Intel macOS),
and it'll only upload the files that are necessary.
6 changes: 3 additions & 3 deletions web/apps/photos/src/services/upload/uploadService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1045,9 +1045,9 @@ const withThumbnail = async (
// ARM64 Linux. This won't be possible since the bundled
// imagemagick doesn't yet support these OS/arch combinations.
//
// 2. We're trying to generate a video thumbnail on Intel macOS.
// This won't be possible since the bundled ffmpeg doesn't
// support Rosetta.
// 2. We're trying to generate a video thumbnail on 32-bit Intel
// macOS. This won't be possible since the bundled universal
// ffmpeg only supports 64-bit archs.
//
// 3. Some other arbitrary exception happened.
//
Expand Down

0 comments on commit 4f91374

Please sign in to comment.