Merge branch 'master' into @WojciechBarczynski/rtmp_output

software-mansion · Nov 12, 2024 · a47c90c · a47c90c
2 parents 7bfbf5a + c816a68
commit a47c90c
Show file tree

Hide file tree

Showing 443 changed files with 27,864 additions and 20,052 deletions.
diff --git a/.github/workflows/demos_check.yml b/.github/workflows/demos_check.yml
@@ -24,28 +24,24 @@ jobs:
               with:
                   submodules: "true"
 
+            - name: Install pnpm
+              uses: pnpm/action-setup@v4
+              with: 
+                  version: 9
+
             - name: Setup Node.js
-              uses: actions/setup-node@v2
+              uses: actions/setup-node@v4
               with:
                   node-version: "20"
 
-            - name: Cache dependencies
-              uses: actions/cache@v2
-              with:
-                  path: ~/.npm
-                  key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-                  restore-keys: |
-                      ${{ runner.os }}-node-
-                      ${{ runner.os }}-
-
             - name: Install project dependencies
               working-directory: ./demos
-              run: npm ci
+              run: pnpm install --frozen-lockfile
 
             - name: Lint code
               working-directory: ./demos
-              run: npm run lint
+              run: pnpm run lint
 
             - name: Typecheck code
               working-directory: ./demos
-              run: npm run typecheck
+              run: pnpm run typecheck
diff --git a/.github/workflows/deploy_docs.yml b/.github/workflows/deploy_docs.yml
@@ -2,13 +2,6 @@ name: deploy to gh-pages
 
 on:
     workflow_dispatch: {}
-    push:
-        branches: [master]
-        paths:
-            - "docs/**"
-            - "schemas/**"
-            - "generate/src/bin/generate_from_types/**"
-            - ".github/workflows/deploy_docs.yml"
 
 permissions:
   contents: write

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -1,5 +1,8 @@
 name: docker
 on:
+    workflow_dispatch: {}
+    schedule:
+      - cron: '0 0 * * 0' # once a week
     push:
         branches: [master]
         paths:

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -29,6 +29,11 @@ jobs:
               with:
                   components: rustfmt, clippy
 
+            - name: Install pnpm
+              uses: pnpm/action-setup@v4
+              with: 
+                  version: 9
+
             - name: 🛠 Setup Node.JS
               uses: actions/setup-node@v4
               with:

diff --git a/.github/workflows/macos_lint.yml b/.github/workflows/macos_lint.yml
@@ -0,0 +1,38 @@
+name: macos lint
+on:
+    push:
+        branches: [master]
+    pull_request:
+        types: [opened, synchronize]
+
+concurrency:
+    group: ${{ github.workflow }}-${{ github.ref }}
+    cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
+
+jobs:
+    check:
+        runs-on: macos-14
+        steps:
+            - name: 🛠 Install system dependencies
+              run: brew install ffmpeg
+
+            - name: 🔧 Install the rust toolchain
+              uses: dtolnay/rust-toolchain@stable
+              with:
+                  components: rustfmt, clippy
+
+            - name: 📥 Checkout repo
+              uses: actions/checkout@v4
+
+            - name: 📁 Rust cache
+              uses: Swatinem/rust-cache@v2
+
+            - name: 🪢 Generate Chromium Embedded Framework bindings
+              run: cargo build --package compositor_chromium
+
+            - name: 📖 Check formatting
+              run: cargo fmt --all --check
+
+            - name: 📎 Run clippy
+              run: cargo clippy --workspace --all-targets -- -D clippy::todo -D warnings
+
diff --git a/.github/workflows/ts_sdk_check.yml b/.github/workflows/ts_sdk_check.yml
@@ -22,32 +22,28 @@ jobs:
             - name: Checkout repo
               uses: actions/checkout@v2
 
+            - name: Install pnpm
+              uses: pnpm/action-setup@v4
+              with: 
+                  version: 9
+
             - name: Setup Node.js
-              uses: actions/setup-node@v2
+              uses: actions/setup-node@v4
               with:
                   node-version: "20"
 
-            - name: Cache dependencies
-              uses: actions/cache@v2
-              with:
-                  path: ~/.npm
-                  key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-                  restore-keys: |
-                      ${{ runner.os }}-node-
-                      ${{ runner.os }}-
-
             - name: Install project dependencies
               working-directory: ./ts
-              run: npm install
+              run: pnpm install --frozen-lockfile
 
             - name: Build
               working-directory: ./ts
-              run: npm run build
+              run: pnpm run build:all
 
             - name: Lint code
               working-directory: ./ts
-              run: npm run lint
+              run: pnpm run lint
 
             - name: Typecheck code
               working-directory: ./ts
-              run: npm run typecheck
+              run: pnpm run typecheck
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -6,5 +6,14 @@
             ],
             "url": "./schemas/scene.schema.json"
         }
-    ]
+    ],
+    "eslint.workingDirectories": [
+      { "directory": "./demos", "changeProcessCWD": true },
+      { "directory": "./ts", "changeProcessCWD": true },
+      { "directory": "./docs", "changeProcessCWD": true }
+    ],
+    "prettier.requireConfig": true,
+    "prettier.configPath": "",
+    "editor.formatOnSave": true,
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,18 +4,21 @@
 
 ### 💥 Breaking changes
 
+- Drop support for `SHADER_UNUSED_VERTEX_OUTPUT` `wgpu` feature.  ([#733](https://github.com/software-mansion/live-compositor/pull/733)) by [@jerzywilczek](https://github.com/jerzywilczek)
+
 ### ✨ New features
 
-- Add `loop` option for MP4 input. ([#699](https://github.com/software-mansion/live-compositor/pull/699)) by [@WojciechBarczynski](https://github.com/WojciechBarczynski)
+- Add `loop` option for MP4 input. ([#699](https://github.com/software-mansion/live-compositor/pull/699) by [@WojciechBarczynski](https://github.com/WojciechBarczynski))
 
 ### 🐛 Bug fixes
 
-- Fix AAC output unregister before the first sample. ([#714](https://github.com/software-mansion/live-compositor/pull/714)) by [@WojciechBarczynski](https://github.com/WojciechBarczynski)pull/714)) by [@WojciechBarczynski](https://github.com/WojciechBarczynski)
-- Fix output mp4 timestamps when output is registered after pipeline start. ([#731](https://github.com/software-mansion/live-compositor/pull/731)) by [@WojciechBarczynski](https://github.com/WojciechBarczynski)
+- Fix AAC output unregister before the first sample. ([#714](https://github.com/software-mansion/live-compositor/pull/714) by [@WojciechBarczynski](https://github.com/WojciechBarczynskipull/714))
+- Fix output mp4 timestamps when output is registered after pipeline start. ([#731](https://github.com/software-mansion/live-compositor/pull/731) by [@WojciechBarczynski](https://github.com/WojciechBarczynski))
 
 ### 🔧 Others
 
 - Automatically rename file under the output path for MP4 output if it already exists. ([#684](https://github.com/software-mansion/live-compositor/pull/684) by [@WojciechBarczynski](https://github.com/WojciechBarczynski))
+- Make `video.encoder.preset` optional in the output register. ([#782](https://github.com/software-mansion/live-compositor/pull/782) by [@WojciechBarczynski](https://github.com/WojciechBarczynski))
 
 ## [v0.3.0](https://github.com/software-mansion/live-compositor/releases/tag/v0.3.0)