Merge branch 'main' into main

ffmpegwasm · Jan 7, 2025 · 3aa3042 · 3aa3042
2 parents 4ff7f4b + 0261cbd
commit 3aa3042
Show file tree

Hide file tree

Showing 49 changed files with 9,078 additions and 265 deletions.
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -1,6 +1,6 @@
 # These are supported funding model platforms
 
-github: [jeromewu]# Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
 patreon: # Replace with a single Patreon username
 open_collective: ffmpegwasm
 ko_fi: # Replace with a single Ko-fi username

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -3,91 +3,185 @@ name: CI
 on:
   push:
     branches:
-    - main
+      - main
   pull_request:
-    branches: 
-    - main
+    branches:
+      - main
 
 jobs:
   build-core:
     runs-on: ubuntu-latest
     steps:
-    - name: Checkout Source Code
-      uses: actions/checkout@v2
-    - name: Update pkg-config database
-      run: sudo ldconfig
-    - name: Setup Docker Buildx
-      id: buildx
-      uses: docker/setup-buildx-action@v2
-    - name: Cache build
-      id: cache-build
-      uses: actions/cache@v2
-      with:
-        path: build-cache-st
-        key: build-cache-st-v1-${{ hashFiles('Dockerfile', 'Makefile', 'build/*') }}
-        restore-keys: |
-          build-cache-st-v1-
-    - name: Build ffmpeg-core
-      run: make prd EXTRA_ARGS="--cache-from=type=local,src=build-cache-st --cache-to=type=local,dest=build-cache-st,mode=max"
-    - name: Upload core
-      uses: actions/upload-artifact@v2
-      with:
-        name: ffmpeg-core
-        path: packages/core/dist/*
+      - name: Checkout Source Code
+        uses: actions/checkout@v2
+      - name: Update pkg-config database
+        run: sudo ldconfig
+      - name: Setup Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Cache build
+        id: cache-build
+        uses: actions/cache@v4
+        with:
+          path: build-cache-st
+          key: build-cache-st-v1-${{ hashFiles('Dockerfile', 'Makefile', 'build/*') }}
+          restore-keys: |
+            build-cache-st-v1-
+      - name: Build ffmpeg-core
+        run: make prd EXTRA_ARGS="--cache-from=type=local,src=build-cache-st --cache-to=type=local,dest=build-cache-st,mode=max"
+      - name: Upload core
+        uses: actions/upload-artifact@v4
+        with:
+          name: ffmpeg-core
+          path: packages/core/dist/*
   build-core-mt:
     runs-on: ubuntu-latest
     steps:
-    - name: Checkout Source Code
-      uses: actions/checkout@v2
-    - name: Setup Docker Buildx
-      id: buildx
-      uses: docker/setup-buildx-action@v2
-    - name: Cache build
-      id: cache-build
-      uses: actions/cache@v2
-      with:
-        path: build-cache-mt
-        key: build-cache-mt-v1-${{ hashFiles('Dockerfile', 'Makefile', 'build/*') }}
-        restore-keys: |
-          build-cache-v1-
-    - name: Build ffmpet-core-mt
-      run: make prd-mt EXTRA_ARGS="--cache-from=type=local,src=build-cache-mt --cache-to=type=local,dest=build-cache-mt,mode=max"
-    - name: Upload core-mt
-      uses: actions/upload-artifact@v2
-      with:
-        name: ffmpeg-core-mt
-        path: packages/core-mt/dist/*
+      - name: Checkout Source Code
+        uses: actions/checkout@v2
+      - name: Setup Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Cache build
+        id: cache-build
+        uses: actions/cache@v4
+        with:
+          path: build-cache-mt
+          key: build-cache-mt-v1-${{ hashFiles('Dockerfile', 'Makefile', 'build/*') }}
+          restore-keys: |
+            build-cache-v1-
+      - name: Build ffmpet-core-mt
+        run: make prd-mt EXTRA_ARGS="--cache-from=type=local,src=build-cache-mt --cache-to=type=local,dest=build-cache-mt,mode=max"
+      - name: Upload core-mt
+        uses: actions/upload-artifact@v4
+        with:
+          name: ffmpeg-core-mt
+          path: packages/core-mt/dist/*
   tests:
     runs-on: ubuntu-latest
     needs:
       - build-core
       - build-core-mt
     steps:
-    - name: Checkout Source Code
-      uses: actions/checkout@v2
-    - name: Download ffmpeg-core
-      uses: actions/download-artifact@v2
-      with:
-        name: ffmpeg-core
-        path: packages/core/dist
-    - name: Download ffmpeg-core-mt
-      uses: actions/download-artifact@v2
-      with:
-        name: ffmpeg-core-mt
-        path: packages/core-mt/dist
-    - name: Use Node.js 18
-      uses: actions/setup-node@v2
-      with:
-        node-version: 18.x
-    - name: Cache dependencies
-      id: cache-dependencies
-      uses: actions/cache@v2
-      with:
-        path: node_modules
-        key: node-modules-${{ hashFiles('package-lock.json') }}
-        restore-keys: |
-          node-modules-
-    - name: Install dependencies
-      run: npm install
-    - name: Run tests
-      run: npm test
+      - name: Checkout Source Code
+        uses: actions/checkout@v2
+      - name: Download ffmpeg-core
+        uses: actions/download-artifact@v4
+        with:
+          name: ffmpeg-core
+          path: packages/core/dist
+      - name: Download ffmpeg-core-mt
+        uses: actions/download-artifact@v4
+        with:
+          name: ffmpeg-core-mt
+          path: packages/core-mt/dist
+      - name: Use Node.js 18
+        uses: actions/setup-node@v2
+        with:
+          node-version: 18.x
+      - name: Cache dependencies
+        id: cache-dependencies
+        uses: actions/cache@v4
+        with:
+          path: node_modules
+          key: node-modules-${{ hashFiles('package-lock.json') }}
+          restore-keys: |
+            node-modules-
+      - name: Install dependencies
+        run: npm install
+      - name: Install Chrome
+        uses: browser-actions/setup-chrome@latest
+        with:
+          chrome-version: stable
+      - name: Run tests
+        env:
+          CHROME_HEADLESS: 1
+          CHROME_PATH: chrome
+          CHROME_FLAGS: "--headless --disable-gpu --no-sandbox --enable-features=SharedArrayBuffer,CrossOriginIsolation"
+          HEADERS: '{"Cross-Origin-Opener-Policy": "same-origin", "Cross-Origin-Embedder-Policy": "require-corp"}'
+        run: |
+          # Start test server with proper headers for all tests
+          npm run serve -- --headers "$HEADERS" &
+
+          # Increase wait time to ensure server is ready
+          sleep 15
+
+          # Verify headers and isolation status
+          echo "Checking security headers and isolation status..."
+          curl -v http://localhost:3000/tests/ffmpeg-core-st.test.html 2>&1 | grep -i "cross-origin"
+
+          # Run verification script first
+          echo "Verifying browser environment..."
+          cat << EOF > verify-browser.html
+          <!DOCTYPE html>
+          <html>
+          <head>
+            <meta http-equiv="Cross-Origin-Opener-Policy" content="same-origin">
+            <meta http-equiv="Cross-Origin-Embedder-Policy" content="require-corp">
+          </head>
+          <body>
+            <script>
+              console.log('SharedArrayBuffer available:', typeof SharedArrayBuffer !== 'undefined');
+              console.log('crossOriginIsolated:', window.crossOriginIsolated);
+              if (!window.crossOriginIsolated || typeof SharedArrayBuffer === 'undefined') {
+                throw new Error('Browser environment not properly configured for SharedArrayBuffer');
+              }
+            </script>
+          </body>
+          </html>
+          EOF
+
+          # Run single-threaded tests first
+          echo "Running single-threaded tests..."
+          npx mocha-headless-chrome \
+            --args="$CHROME_FLAGS" \
+            -a no-sandbox \
+            -f http://localhost:3000/tests/ffmpeg-core-st.test.html 2>&1 | tee st-core-test.log
+
+          npx mocha-headless-chrome \
+            --args="$CHROME_FLAGS" \
+            -a no-sandbox \
+            -f http://localhost:3000/tests/ffmpeg-st.test.html 2>&1 | tee st-test.log
+
+          # Run multi-threaded tests
+          echo "Running multi-threaded tests..."
+          # Create a test script to verify browser environment
+          cat << EOF > verify-browser.html
+          <!DOCTYPE html>
+          <html>
+          <head>
+            <title>Browser Environment Test</title>
+          </head>
+          <body>
+            <script>
+              console.log('SharedArrayBuffer available:', typeof SharedArrayBuffer !== 'undefined');
+              console.log('crossOriginIsolated:', window.crossOriginIsolated);
+            </script>
+          </body>
+          </html>
+          EOF
+
+          # Run the verification in Chrome
+          echo "Verifying browser environment..."
+          npx mocha-headless-chrome \
+            --args="$CHROME_FLAGS --enable-features=SharedArrayBuffer,CrossOriginIsolation" \
+            -a no-sandbox \
+            -f http://localhost:3000/verify-browser.html
+
+          # Run MT tests with verified configuration
+          npx mocha-headless-chrome \
+            --args="$CHROME_FLAGS --enable-features=SharedArrayBuffer,CrossOriginIsolation" \
+            -a no-sandbox \
+            -f http://localhost:3000/tests/ffmpeg-core-mt.test.html 2>&1 | tee mt-core-test.log
+
+          npx mocha-headless-chrome \
+            --args="$CHROME_FLAGS --enable-features=SharedArrayBuffer,CrossOriginIsolation" \
+            -a no-sandbox \
+            -f http://localhost:3000/tests/ffmpeg-mt.test.html 2>&1 | tee mt-test.log
+
+          # Display all logs for debugging
+          echo "=== Test Logs ==="
+          for log in *-test.log; do
+            echo "Contents of $log:"
+            cat $log
+          done
diff --git a/README.md b/README.md
@@ -1,3 +1,6 @@
+This project is looking for maintainers. If you are interested to give it a go, please email [me](mailto:[email protected]) to further discuss maintenance.
+
+---
 <p align="center">
   <a href="#">
     <img alt="ffmpeg.wasm" width="128px" height="128px" src="https://github.com/ffmpegwasm/ffmpeg.wasm/blob/main/apps/website/static/img/logo192.png"></img>

diff --git a/apps/angular-app/src/app/app.component.ts b/apps/angular-app/src/app/app.component.ts
@@ -4,7 +4,7 @@ import { RouterOutlet } from '@angular/router';
 import { FFmpeg } from '@ffmpeg/ffmpeg';
 import { fetchFile, toBlobURL } from '@ffmpeg/util';
 
-const baseURL = "https://unpkg.com/@ffmpeg/[email protected].6/dist/esm";
+const baseURL = 'https://unpkg.com/@ffmpeg/[email protected].9/dist/esm';
 
 @Component({
   selector: 'app-root',
@@ -16,33 +16,34 @@ const baseURL = "https://unpkg.com/@ffmpeg/[email protected]/dist/esm";
 export class AppComponent {
   loaded = false;
   ffmpeg = new FFmpeg();
-  videoURL = "";
-  message = "";
+  videoURL = '';
+  message = '';
   async load() {
-    this.ffmpeg.on("log", ({ message }) => {
+    this.ffmpeg.on('log', ({ message }) => {
       this.message = message;
     });
     await this.ffmpeg.load({
-      coreURL: await toBlobURL(`${baseURL}/ffmpeg-core.js`, "text/javascript"),
+      coreURL: await toBlobURL(`${baseURL}/ffmpeg-core.js`, 'text/javascript'),
       wasmURL: await toBlobURL(
         `${baseURL}/ffmpeg-core.wasm`,
-        "application/wasm"
+        'application/wasm',
       ),
       workerURL: await toBlobURL(
         `${baseURL}/ffmpeg-core.worker.js`,
-        "text/javascript"
+        'text/javascript',
       ),
     });
     this.loaded = true;
-  };
+  }
   async transcode() {
-    const videoURL = "https://raw.githubusercontent.com/ffmpegwasm/testdata/master/video-15s.avi";
-    await this.ffmpeg.writeFile("input.avi", await fetchFile(videoURL));
-    await this.ffmpeg.exec(["-i", "input.avi", "output.mp4"]);
+    const videoURL =
+      'https://raw.githubusercontent.com/ffmpegwasm/testdata/master/video-15s.avi';
+    await this.ffmpeg.writeFile('input.avi', await fetchFile(videoURL));
+    await this.ffmpeg.exec(['-i', 'input.avi', 'output.mp4']);
     const fileData = await this.ffmpeg.readFile('output.mp4');
     const data = new Uint8Array(fileData as ArrayBuffer);
     this.videoURL = URL.createObjectURL(
-      new Blob([data.buffer], { type: 'video/mp4' })
+      new Blob([data.buffer], { type: 'video/mp4' }),
     );
-  };
+  }
 }