beenull/ente
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Remove log interceptors

Browse source
This commit is contained in:
Manav Rathi 2024-04-21 09:48:34 +05:30
parent e39194d993
commit 36ccd3b202
No known key found for this signature in database
1 changed files with 59 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

134
web/apps/photos/src/services/ffmpeg.ts
View file

@ -1,4 +1,3 @@
import log from "@/next/log";
import { ComlinkWorker } from "@/next/worker/comlink-worker";
import { validateAndGetCreationUnixTimeInMicroSeconds } from "@ente/shared/time";
import { Remote } from "comlink";
@ -15,69 +14,59 @@ import { type DedicatedFFmpegWorker } from "worker/ffmpeg.worker";
export async function generateVideoThumbnail(
file: File | ElectronFile,
): Promise<File | ElectronFile> {
try {
let seekTime = 1;
while (seekTime >= 0) {
try {
return await ffmpegExec(
[
FFMPEG_PLACEHOLDER,
"-i",
INPUT_PATH_PLACEHOLDER,
"-ss",
`00:00:0${seekTime}`,
"-vframes",
"1",
"-vf",
"scale=-1:720",
OUTPUT_PATH_PLACEHOLDER,
],
file,
"thumb.jpeg",
);
} catch (e) {
if (seekTime === 0) {
throw e;
}
let seekTime = 1;
while (seekTime >= 0) {
try {
return await ffmpegExec(
[
FFMPEG_PLACEHOLDER,
"-i",
INPUT_PATH_PLACEHOLDER,
"-ss",
`00:00:0${seekTime}`,
"-vframes",
"1",
"-vf",
"scale=-1:720",
OUTPUT_PATH_PLACEHOLDER,
],
file,
"thumb.jpeg",
);
} catch (e) {
if (seekTime === 0) {
throw e;
}
seekTime--;
}
} catch (e) {
log.error("ffmpeg generateVideoThumbnail failed", e);
throw e;
seekTime--;
}
}
/** Called during upload */
export async function extractVideoMetadata(file: File | ElectronFile) {
try {
// https://stackoverflow.com/questions/9464617/retrieving-and-saving-media-metadata-using-ffmpeg
// -c [short for codex] copy[(stream_specifier)[ffmpeg.org/ffmpeg.html#Stream-specifiers]] => copies all the stream without re-encoding
// -map_metadata [http://ffmpeg.org/ffmpeg.html#Advanced-options search for map_metadata] => copies all stream metadata to the out
// -f ffmetadata [https://ffmpeg.org/ffmpeg-formats.html#Metadata-1] => dump metadata from media files into a simple UTF-8-encoded INI-like text file
const metadata = await ffmpegExec(
[
FFMPEG_PLACEHOLDER,
"-i",
INPUT_PATH_PLACEHOLDER,
"-c",
"copy",
"-map_metadata",
"0",
"-f",
"ffmetadata",
OUTPUT_PATH_PLACEHOLDER,
],
file,
`metadata.txt`,
);
return parseFFmpegExtractedMetadata(
new Uint8Array(await metadata.arrayBuffer()),
);
} catch (e) {
log.error("ffmpeg extractVideoMetadata failed", e);
throw e;
}
// https://stackoverflow.com/questions/9464617/retrieving-and-saving-media-metadata-using-ffmpeg
// -c [short for codex] copy[(stream_specifier)[ffmpeg.org/ffmpeg.html#Stream-specifiers]] => copies all the stream without re-encoding
// -map_metadata [http://ffmpeg.org/ffmpeg.html#Advanced-options search for map_metadata] => copies all stream metadata to the out
// -f ffmetadata [https://ffmpeg.org/ffmpeg-formats.html#Metadata-1] => dump metadata from media files into a simple UTF-8-encoded INI-like text file
const metadata = await ffmpegExec(
[
FFMPEG_PLACEHOLDER,
"-i",
INPUT_PATH_PLACEHOLDER,
"-c",
"copy",
"-map_metadata",
"0",
"-f",
"ffmetadata",
OUTPUT_PATH_PLACEHOLDER,
],
file,
`metadata.txt`,
);
return parseFFmpegExtractedMetadata(
new Uint8Array(await metadata.arrayBuffer()),
);
}
enum MetadataTags {
@ -146,24 +135,19 @@ function parseCreationTime(creationTime: string) {
/** Called when viewing a file */
export async function convertToMP4(file: File) {
try {
return await ffmpegExec(
[
FFMPEG_PLACEHOLDER,
"-i",
INPUT_PATH_PLACEHOLDER,
"-preset",
"ultrafast",
OUTPUT_PATH_PLACEHOLDER,
],
file,
"output.mp4",
true,
);
} catch (e) {
log.error("ffmpeg convertToMP4 failed", e);
throw e;
}
return await ffmpegExec(
[
FFMPEG_PLACEHOLDER,
"-i",
INPUT_PATH_PLACEHOLDER,
"-preset",
"ultrafast",
OUTPUT_PATH_PLACEHOLDER,
],
file,
"output.mp4",
true,
);
}
/**