Skip to content

Commit 0d12126

Browse files
lucasgelfondlucasgelfond
committed
Release - v12.11 | v0.12.7
1 parent c02059d commit 0d12126

File tree

10 files changed

+79
-65
lines changed

10 files changed

+79
-65
lines changed

‎apps/angular-app/src/app/app.component.ts

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { RouterOutlet } from '@angular/router';
44
import { FFmpeg } from '@ffmpeg/ffmpeg';
55
import { fetchFile, toBlobURL } from '@ffmpeg/util';
66

7-
const baseURL = "https://unpkg.com/@ffmpeg/[email protected].6/dist/esm";
7+
const baseURL = 'https://unpkg.com/@ffmpeg/[email protected].7/dist/esm';
88

99
@Component({
1010
selector: 'app-root',
@@ -16,33 +16,34 @@ const baseURL = "https://unpkg.com/@ffmpeg/[email protected]/dist/esm";
1616
export class AppComponent {
1717
loaded = false;
1818
ffmpeg = new FFmpeg();
19-
videoURL = "";
20-
message = "";
19+
videoURL = '';
20+
message = '';
2121
async load() {
22-
this.ffmpeg.on("log", ({ message }) => {
22+
this.ffmpeg.on('log', ({ message }) => {
2323
this.message = message;
2424
});
2525
await this.ffmpeg.load({
26-
coreURL: await toBlobURL(`${baseURL}/ffmpeg-core.js`, "text/javascript"),
26+
coreURL: await toBlobURL(`${baseURL}/ffmpeg-core.js`, 'text/javascript'),
2727
wasmURL: await toBlobURL(
2828
`${baseURL}/ffmpeg-core.wasm`,
29-
"application/wasm"
29+
'application/wasm'
3030
),
3131
workerURL: await toBlobURL(
3232
`${baseURL}/ffmpeg-core.worker.js`,
33-
"text/javascript"
33+
'text/javascript'
3434
),
3535
});
3636
this.loaded = true;
37-
};
37+
}
3838
async transcode() {
39-
const videoURL = "https://raw.githubusercontent.com/ffmpegwasm/testdata/master/video-15s.avi";
40-
await this.ffmpeg.writeFile("input.avi", await fetchFile(videoURL));
41-
await this.ffmpeg.exec(["-i", "input.avi", "output.mp4"]);
39+
const videoURL =
40+
'https://raw.githubusercontent.com/ffmpegwasm/testdata/master/video-15s.avi';
41+
await this.ffmpeg.writeFile('input.avi', await fetchFile(videoURL));
42+
await this.ffmpeg.exec(['-i', 'input.avi', 'output.mp4']);
4243
const fileData = await this.ffmpeg.readFile('output.mp4');
4344
const data = new Uint8Array(fileData as ArrayBuffer);
4445
this.videoURL = URL.createObjectURL(
4546
new Blob([data.buffer], { type: 'video/mp4' })
4647
);
47-
};
48+
}
4849
}

‎apps/nextjs-app/app/Home.tsx

Lines changed: 38 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,52 @@
1-
'use client'
1+
"use client";
22

3-
import { FFmpeg } from '@ffmpeg/ffmpeg'
4-
import { fetchFile, toBlobURL } from '@ffmpeg/util'
5-
import { useRef, useState } from 'react'
3+
import { FFmpeg } from "@ffmpeg/ffmpeg";
4+
import { fetchFile, toBlobURL } from "@ffmpeg/util";
5+
import { useRef, useState } from "react";
66

77
export default function Home() {
8-
const [loaded, setLoaded] = useState(false)
9-
const [isLoading, setIsLoading] = useState(false)
10-
const ffmpegRef = useRef(new FFmpeg())
11-
const videoRef = useRef<HTMLVideoElement | null>(null)
12-
const messageRef = useRef<HTMLParagraphElement | null>(null)
8+
const [loaded, setLoaded] = useState(false);
9+
const [isLoading, setIsLoading] = useState(false);
10+
const ffmpegRef = useRef(new FFmpeg());
11+
const videoRef = useRef<HTMLVideoElement | null>(null);
12+
const messageRef = useRef<HTMLParagraphElement | null>(null);
1313

1414
const load = async () => {
15-
setIsLoading(true)
16-
const baseURL = 'https://unpkg.com/@ffmpeg/[email protected].6/dist/umd'
17-
const ffmpeg = ffmpegRef.current
18-
ffmpeg.on('log', ({ message }) => {
19-
if (messageRef.current) messageRef.current.innerHTML = message
20-
})
15+
setIsLoading(true);
16+
const baseURL = "https://unpkg.com/@ffmpeg/[email protected].7/dist/umd";
17+
const ffmpeg = ffmpegRef.current;
18+
ffmpeg.on("log", ({ message }) => {
19+
if (messageRef.current) messageRef.current.innerHTML = message;
20+
});
2121
// toBlobURL is used to bypass CORS issue, urls with the same
2222
// domain can be used directly.
2323
await ffmpeg.load({
24-
coreURL: await toBlobURL(`${baseURL}/ffmpeg-core.js`, 'text/javascript'),
25-
wasmURL: await toBlobURL(`${baseURL}/ffmpeg-core.wasm`, 'application/wasm')
26-
})
27-
setLoaded(true)
28-
setIsLoading(false)
29-
}
24+
coreURL: await toBlobURL(`${baseURL}/ffmpeg-core.js`, "text/javascript"),
25+
wasmURL: await toBlobURL(
26+
`${baseURL}/ffmpeg-core.wasm`,
27+
"application/wasm"
28+
),
29+
});
30+
setLoaded(true);
31+
setIsLoading(false);
32+
};
3033

3134
const transcode = async () => {
32-
const ffmpeg = ffmpegRef.current
35+
const ffmpeg = ffmpegRef.current;
3336
// u can use 'https://ffmpegwasm.netlify.app/video/video-15s.avi' to download the video to public folder for testing
34-
await ffmpeg.writeFile('input.avi', await fetchFile('https://raw.githubusercontent.com/ffmpegwasm/testdata/master/video-15s.avi'))
35-
await ffmpeg.exec(['-i', 'input.avi', 'output.mp4'])
36-
const data = (await ffmpeg.readFile('output.mp4')) as any
37+
await ffmpeg.writeFile(
38+
"input.avi",
39+
await fetchFile(
40+
"https://raw.githubusercontent.com/ffmpegwasm/testdata/master/video-15s.avi"
41+
)
42+
);
43+
await ffmpeg.exec(["-i", "input.avi", "output.mp4"]);
44+
const data = (await ffmpeg.readFile("output.mp4")) as any;
3745
if (videoRef.current)
38-
videoRef.current.src = URL.createObjectURL(new Blob([data.buffer], { type: 'video/mp4' }))
39-
}
46+
videoRef.current.src = URL.createObjectURL(
47+
new Blob([data.buffer], { type: "video/mp4" })
48+
);
49+
};
4050

4151
return loaded ? (
4252
<div className="fixed top-[50%] left-[50%] translate-x-[-50%] translate-y-[-50%]">
@@ -72,5 +82,5 @@ export default function Home() {
7282
</span>
7383
)}
7484
</button>
75-
)
85+
);
7686
}

‎apps/react-vite-app/src/App.tsx

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ import { toBlobURL, fetchFile } from "@ffmpeg/util";
55
function App() {
66
const [loaded, setLoaded] = useState(false);
77
const ffmpegRef = useRef(new FFmpeg());
8-
const videoRef = useRef<HTMLVideoElement | null>(null)
9-
const messageRef = useRef<HTMLParagraphElement | null>(null)
8+
const videoRef = useRef<HTMLVideoElement | null>(null);
9+
const messageRef = useRef<HTMLParagraphElement | null>(null);
1010

1111
const load = async () => {
12-
const baseURL = "https://unpkg.com/@ffmpeg/[email protected].6/dist/esm";
12+
const baseURL = "https://unpkg.com/@ffmpeg/[email protected].7/dist/esm";
1313
const ffmpeg = ffmpegRef.current;
1414
ffmpeg.on("log", ({ message }) => {
1515
if (messageRef.current) messageRef.current.innerHTML = message;
@@ -31,16 +31,17 @@ function App() {
3131
};
3232

3333
const transcode = async () => {
34-
const videoURL = "https://raw.githubusercontent.com/ffmpegwasm/testdata/master/video-15s.avi";
34+
const videoURL =
35+
"https://raw.githubusercontent.com/ffmpegwasm/testdata/master/video-15s.avi";
3536
const ffmpeg = ffmpegRef.current;
3637
await ffmpeg.writeFile("input.avi", await fetchFile(videoURL));
3738
await ffmpeg.exec(["-i", "input.avi", "output.mp4"]);
38-
const fileData = await ffmpeg.readFile('output.mp4');
39+
const fileData = await ffmpeg.readFile("output.mp4");
3940
const data = new Uint8Array(fileData as ArrayBuffer);
4041
if (videoRef.current) {
4142
videoRef.current.src = URL.createObjectURL(
42-
new Blob([data.buffer], { type: 'video/mp4' })
43-
)
43+
new Blob([data.buffer], { type: "video/mp4" })
44+
);
4445
}
4546
};
4647

‎apps/vue-vite-app/src/components/FFmpegDemo.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import type { LogEvent } from '@ffmpeg/ffmpeg/dist/esm/types'
1111
import { fetchFile, toBlobURL } from '@ffmpeg/util'
1212
import { defineComponent, ref } from 'vue'
1313
14-
const baseURL = 'https://unpkg.com/@ffmpeg/[email protected].6/dist/esm'
14+
const baseURL = 'https://unpkg.com/@ffmpeg/[email protected].7/dist/esm'
1515
const videoURL = 'https://raw.githubusercontent.com/ffmpegwasm/testdata/master/video-15s.avi'
1616
1717
export default defineComponent({

‎apps/website/docs/getting-started/usage.md

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ It is recommended to read [Overview](/docs/overview) first.
1111
:::caution
1212
If you are a [vite](https://vitejs.dev/) user, use `esm` in **baseURL** instead of `umd`:
1313

14-
~~https://unpkg.com/@ffmpeg/[email protected].6/dist/umd~~ => https://unpkg.com/@ffmpeg/[email protected].6/dist/esm
14+
~~https://unpkg.com/@ffmpeg/[email protected].7/dist/umd~~ => https://unpkg.com/@ffmpeg/[email protected].7/dist/esm
1515
:::
1616

1717
```jsx live
@@ -24,7 +24,7 @@ function() {
2424
const messageRef = useRef(null);
2525

2626
const load = async () => {
27-
const baseURL = 'https://unpkg.com/@ffmpeg/[email protected].6/dist/umd'
27+
const baseURL = 'https://unpkg.com/@ffmpeg/[email protected].7/dist/umd'
2828
const ffmpeg = ffmpegRef.current;
2929
ffmpeg.on('log', ({ message }) => {
3030
messageRef.current.innerHTML = message;
@@ -81,7 +81,7 @@ function() {
8181
const messageRef = useRef(null);
8282

8383
const load = async () => {
84-
const baseURL = 'https://unpkg.com/@ffmpeg/[email protected].6/dist/umd'
84+
const baseURL = 'https://unpkg.com/@ffmpeg/[email protected].7/dist/umd'
8585
const ffmpeg = ffmpegRef.current;
8686
ffmpeg.on('log', ({ message }) => {
8787
messageRef.current.innerHTML = message;
@@ -134,7 +134,7 @@ function() {
134134
const messageRef = useRef(null);
135135

136136
const load = async () => {
137-
const baseURL = 'https://unpkg.com/@ffmpeg/[email protected].6/dist/umd'
137+
const baseURL = 'https://unpkg.com/@ffmpeg/[email protected].7/dist/umd'
138138
const ffmpeg = ffmpegRef.current;
139139
ffmpeg.on('log', ({ message }) => {
140140
messageRef.current.innerHTML = message;
@@ -192,7 +192,7 @@ function() {
192192
const messageRef = useRef(null);
193193

194194
const load = async () => {
195-
const baseURL = 'https://unpkg.com/@ffmpeg/[email protected].6/dist/umd'
195+
const baseURL = 'https://unpkg.com/@ffmpeg/[email protected].7/dist/umd'
196196
const ffmpeg = ffmpegRef.current;
197197
// Listen to progress event instead of log.
198198
ffmpeg.on('progress', ({ progress, time }) => {
@@ -243,7 +243,7 @@ function() {
243243
const messageRef = useRef(null);
244244

245245
const load = async () => {
246-
const baseURL = 'https://unpkg.com/@ffmpeg/[email protected].6/dist/umd'
246+
const baseURL = 'https://unpkg.com/@ffmpeg/[email protected].7/dist/umd'
247247
const ffmpeg = ffmpegRef.current;
248248
ffmpeg.on('log', ({ message }) => {
249249
messageRef.current.innerHTML = message;
@@ -313,7 +313,7 @@ function() {
313313
const messageRef = useRef(null);
314314

315315
const load = async () => {
316-
const baseURL = 'https://unpkg.com/@ffmpeg/[email protected].6/dist/umd'
316+
const baseURL = 'https://unpkg.com/@ffmpeg/[email protected].7/dist/umd'
317317
const ffmpeg = ffmpegRef.current;
318318
ffmpeg.on('log', ({ message }) => {
319319
messageRef.current.innerHTML = message;
@@ -372,7 +372,7 @@ function() {
372372
const messageRef = useRef(null);
373373

374374
const load = async () => {
375-
const baseURL = 'https://unpkg.com/@ffmpeg/[email protected].6/dist/umd'
375+
const baseURL = 'https://unpkg.com/@ffmpeg/[email protected].7/dist/umd'
376376
const ffmpeg = ffmpegRef.current;
377377
ffmpeg.on('log', ({ message }) => {
378378
messageRef.current.innerHTML = message;
@@ -425,18 +425,20 @@ function() {
425425

426426
:::note
427427
Required:
428+
428429
- @ffmpeg/ffmpeg@0.12.7+
429430
- @ffmpeg/core@0.12.4+
430-
:::
431+
:::
431432

432433
Please Check this PR: [Add WORKERFS support](https://github.com/ffmpegwasm/ffmpeg.wasm/pull/581)
433434

434435
## Abort exec() with signal
435436

436437
:::note
437438
Required:
439+
438440
- @ffmpeg/ffmpeg@0.12.7+
439441
- @ffmpeg/core@0.12.4+
440-
:::
442+
:::
441443

442444
Please check this PR: [abort signal](https://github.com/ffmpegwasm/ffmpeg.wasm/pull/573)

‎package-lock.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/core-mt/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@ffmpeg/core-mt",
3-
"version": "0.12.6",
3+
"version": "0.12.7",
44
"description": "FFmpeg WebAssembly version (multi thread)",
55
"main": "./dist/umd/ffmpeg-core.js",
66
"exports": {

‎packages/core/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@ffmpeg/core",
3-
"version": "0.12.6",
3+
"version": "0.12.7",
44
"description": "FFmpeg WebAssembly version (single thread)",
55
"main": "./dist/umd/ffmpeg-core.js",
66
"exports": {

‎packages/ffmpeg/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@ffmpeg/ffmpeg",
3-
"version": "0.12.10",
3+
"version": "0.12.11",
44
"description": "FFmpeg WebAssembly version for browser",
55
"main": "./dist/umd/ffmpeg.js",
66
"types": "./dist/esm/index.d.ts",

‎packages/ffmpeg/src/const.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
export const MIME_TYPE_JAVASCRIPT = "text/javascript";
22
export const MIME_TYPE_WASM = "application/wasm";
33

4-
export const CORE_VERSION = "0.12.6";
4+
export const CORE_VERSION = "0.12.7";
55
export const CORE_URL = `https://unpkg.com/@ffmpeg/core@${CORE_VERSION}/dist/umd/ffmpeg-core.js`;
66

77
export enum FFMessageType {

0 commit comments

Comments
 (0)