Repository navigation
Sync upstream 2026-11-19 (1090 commits) - #28
Merged
Merged
Conversation
…re-fps fix(export): default the frame rate from the rate a screen was captured at
…ck ends Rolling back an interrupted cleanup now syncs the folders the media moved back into before restoring the project files and removing the journal, so a power loss right after cannot keep the old metadata without the media.
Decoded samples are filed under the nearest grid index, but a request time is floored to its grid index. When a trim or stream offset puts request times past the middle of a cell, a sample captured in the second half of the cell is filed under the next index and is passed over even though it is already on screen, so the screen lags the cursor by one source frame. Decoded frames now carry their presentation time. A request past the middle of its cell also asks for the next grid index and uses that sample when it was presented at or before the request time. Samples on the grid can never pass that check, so their answers are unchanged.
The decoder model's expected answers now include the next-index check, count reads up to the index the handle reaches, and a new test reads samples between grid lines with off-grid requests. Seek and sequential reads now agree for most former grid-rounding cases; the remaining ones follow a hold of two cells or more.
…surface its stalls
…-above-menu-bar fix(desktop-gpui): let the area picker cover the macOS menu bar
…erve-source feat: keep 4:4:4 video sharp when importing
…a-switch-in-place Keep Studio recording through a camera switch
…put-dropped-lock Accept a camera selection right after a recording drops its camera lock
…-copy-before-writer fix(recording): stop macOS Studio camera recordings from freezing the screen
…-input-size fix(render-farm): limit cloud export inputs to 40M pixels
# Conflicts: # apps/web/app/s/[videoId]/page.tsx # apps/web/lib/share-video-metadata.ts
Author
|
Migration |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merges 1090 upstream commits from
CapSoftware/Cap:mainintosmg. Closes #27.Conflicts
Two files conflicted, both from
feat/share-unfurl-ai-summary(#11). Both sides only add fields, so the resolution keeps both:apps/web/lib/share-video-metadata.ts: ourdescriptioninput stays next to upstream's newthumbnailVersioninput andbuildVideoOgImageUrl.apps/web/app/s/[videoId]/page.tsx: keeps ourEffect.flatMapthat loads the AI summary, and passes upstream'sthumbnailVersiontobuildShareVideoMetadata.Database migrations
This sync adds a migration. It runs when Cap Web starts, and rolling back the image does not roll back the schema, so it does not auto-merge.
packages/database/migrations/0062_dashboard_library_tools.sqlpackages/database/migrations/meta/0062_snapshot.jsonpackages/database/migrations/meta/_journal.json0062_dashboard_library_toolsadds two nullable columns (space_videos.position,videos.archivedAt) and one index onvideos. Take a MySQL backup before merging, then addmigrations-approvedand merge by hand.Verified locally
share-stage-identity.test.tsfails only on Node 26 locally (window.localStorageis Node's native one); it passes with--no-experimental-webstorageand the file is unchanged from upstream.Upstream merges (first parent)