TerribleDev/ente
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[desktop] Potential live photo workaround for Linux-en (#5536)

Browse Source
This commit is contained in:
Manav Rathi
2025-04-04 17:44:21 +05:30
committed by GitHub
parent 73d67277b7 b261f72864
commit 93ad3d65fd
3 changed files with 41 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
web/packages/gallery/components/viewer/photoswipe.ts
View File

@@ -378,18 +378,20 @@ export class FileViewerPhotoSwipe {
/**
* A wrapper over video.play that prevents Chrome from spamming the
* console with errors about interrupted plays when scrolling through
* files fast by keeping arrow keys pressed.
* files fast by keeping arrow keys pressed, or when the slide is reloaded.
*/
const abortablePlayVideo = async (videoElement: HTMLVideoElement) => {
try {
await videoElement.play();
} catch (e) {
// Known message strings prefixes.
// - "The play() request was interrupted by a call to pause()."
// - "The play() request was interrupted because the media was removed from the document."
if (
e instanceof Error &&
e.name == "AbortError" &&
e.message.startsWith(
"The play() request was interrupted by a call to pause().",
)
e.message.startsWith("The play() request was interrupted")
) {
// Ignore.
} else {

1
web/packages/gallery/services/download.ts
View File

@@ -634,6 +634,7 @@ const createRenderableSourceURLs = async (
playableVideoURL(
livePhoto.videoFileName,
new Blob([livePhoto.videoData]),
{ fileType },
);
return { type: "livePhoto", imageURL, originalImageBlob, videoURL };

35
web/packages/gallery/utils/convert.ts
View File

@@ -1,6 +1,7 @@
import { isDesktop } from "ente-base/app";
import log from "ente-base/log";
import { workerBridge } from "ente-base/worker/worker-bridge";
import { FileType } from "ente-media/file-type";
import { isHEICExtension, needsJPEGConversion } from "ente-media/formats";
import { heicToJPEG } from "ente-media/heic-convert";
import { convertToMP4 } from "../services/ffmpeg";
@@ -170,17 +171,49 @@ const testHEICDataURL =
* videos since the Wasm FFmpeg implementation is much slower.
*
* 3. On errors, return the original (as would've happened for step 1).
*
* A special case if for FileType.livePhoto on Linux in the desktop app, where
* the conversion always happens to workaround the audio only playback in that
* specific scenario.
*/
export const playableVideoURL = async (
fileName: string,
videoBlob: Blob,
opts?: { fileType?: FileType },
): Promise<string> => {
const videoObjectURL = URL.createObjectURL(videoBlob);
const isPlayable = await isPlaybackPossible(videoObjectURL);
let shouldConvert = false;
if (!isPlayable) {
if (isPlayable) {
// The browser thinks it can play this video.
//
// But it is not a guarantee. In particular, a problematic case is when
// for a particular codec combination, browser can play the audio
// stream, but not the video stream. `isPlaybackPossible` would return
// true, but when the user will hear only audio and not see the video.
//
// For videos themselves, we solve this (and other issues) by providing
// a streaming variant. However it can still happen for live photos.
//
// Unfortunately, I haven't found a way yet of detecting if this
// scenario is going to arise (open a issue if you've found one).
// Fortunately, this particular failure mode has only been reported on
// Linux desktop app (which uses Chromium underneath). So we add a
// special case - if (desktop && livePhoto && linux) then forceConvert.
// Practically this is a reasonable fallback since the video component
// of a live photo is going to be a few seconds only, and the video
// conversion is fast in the desktop app.
if (
isDesktop &&
opts?.fileType == FileType.livePhoto &&
// eslint-disable-next-line @typescript-eslint/no-deprecated
navigator.platform.startsWith("Linux")
) {
shouldConvert = true;
}
} else {
// The browser doesn't think it can play this video, try transcoding.
if (isDesktop) {
// Always on desktop.