From 7d499dd4fff1f9f4a1f88cb878d060e8fe14c39f Mon Sep 17 00:00:00 2001 From: Jerome Wu Date: Thu, 27 Jul 2023 00:08:03 +0800 Subject: [PATCH] Move .lfsconfig and update usage --- apps/website/.lfsconfig => .lfsconfig | 0 apps/website/docs/getting-started/usage.md | 20 +++++++++++++++++--- apps/website/netlify.toml | 1 - 3 files changed, 17 insertions(+), 4 deletions(-) rename apps/website/.lfsconfig => .lfsconfig (100%) diff --git a/apps/website/.lfsconfig b/.lfsconfig similarity index 100% rename from apps/website/.lfsconfig rename to .lfsconfig diff --git a/apps/website/docs/getting-started/usage.md b/apps/website/docs/getting-started/usage.md index bb4d5cb..1e29a7e 100644 --- a/apps/website/docs/getting-started/usage.md +++ b/apps/website/docs/getting-started/usage.md @@ -17,17 +17,19 @@ a ~31 MB ffmpeg-core.wasm. // import { FFmpeg } from '@ffmpeg/ffmpeg'; // import { fetchFile } from '@ffmpeg/util'; function() { - const baseURL = 'https://unpkg.com/@ffmpeg/core@0.12.1/dist/umd' const [loaded, setLoaded] = useState(false); const ffmpegRef = useRef(new FFmpeg()); const videoRef = useRef(null); const messageRef = useRef(null); const load = async () => { + const baseURL = 'https://unpkg.com/@ffmpeg/core@0.12.1/dist/umd' const ffmpeg = ffmpegRef.current; ffmpeg.on("log", ({ message }) => { messageRef.current.innerHTML = message; }); + // toBlobURL is used to bypass CORS issue, urls with the same + // domain can be used directly. await ffmpeg.load({ coreURL: await toBlobURL(`${baseURL}/ffmpeg-core.js`), wasmURL: await toBlobURL(`${baseURL}/ffmpeg-core.wasm`), @@ -138,11 +140,17 @@ function() { const messageRef = useRef(null); const load = async () => { + const baseURL = 'https://unpkg.com/@ffmpeg/core@0.12.1/dist/umd' const ffmpeg = ffmpegRef.current; ffmpeg.on("log", ({ message }) => { messageRef.current.innerHTML = message; }); - await ffmpeg.load(); + // toBlobURL is used to bypass CORS issue, urls with the same + // domain can be used directly. + await ffmpeg.load({ + coreURL: await toBlobURL(`${baseURL}/ffmpeg-core.js`), + wasmURL: await toBlobURL(`${baseURL}/ffmpeg-core.wasm`), + }); setLoaded(true); } @@ -186,12 +194,18 @@ function() { const messageRef = useRef(null); const load = async () => { + const baseURL = 'https://unpkg.com/@ffmpeg/core@0.12.1/dist/umd' const ffmpeg = ffmpegRef.current; // Listen to progress event instead of log. ffmpeg.on("progress", ({ progress }) => { messageRef.current.innerHTML = `${progress * 100} %`; }); - await ffmpeg.load(); + // toBlobURL is used to bypass CORS issue, urls with the same + // domain can be used directly. + await ffmpeg.load({ + coreURL: await toBlobURL(`${baseURL}/ffmpeg-core.js`), + wasmURL: await toBlobURL(`${baseURL}/ffmpeg-core.wasm`), + }); setLoaded(true); } diff --git a/apps/website/netlify.toml b/apps/website/netlify.toml index 9318a9d..cedaec2 100644 --- a/apps/website/netlify.toml +++ b/apps/website/netlify.toml @@ -3,4 +3,3 @@ [headers.values] Cross-Origin-Opener-Policy = "same-origin" Cross-Origin-Embedder-Policy = "require-corp" - Access-Control-Allow-Origin = "*"