Merge upstream final 54 commits + orphaned-PR harvest#19
Merged
Conversation
…tive zoom Union resolution keeping fork features (segmented webcam, focus regions, subtitles, corner/stack presets) plus upstream's auto-caption pipeline, custom cursor themes, webcam mirror toggle, reactive PiP zoom, and the cursor smoothing rewrite. Cursor-in-export plumbing restored via upstream's exporter config fields. Reactive webcam shrink is gated off while a focus region animates so it doesn't fight the focus-zoom rect. Locale gaps (upstream en-only keys) filled with English fallback. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Port isSourceCopyFastPathEligible/getSourceCopyFastPathBlockers and the copy-only export path dropped when the segmented exporter replaced upstream's. Unedited MP4 exports at source resolution now return the source bytes directly instead of re-encoding. Fork-specific blockers added for webcam segments and active subtitles. Fixes the 4 failing videoExporter tests. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
…rash on stop Ported from archived upstream PR siddharthvaddem#687. Native macOS/Windows capture buffered the whole webcam sidecar in renderer memory and assembled it on stop; long takes OOM-crashed the renderer and lost the recording. Webcam chunks now stream to disk like the screen track (siddharthvaddem#616), with partial-file cleanup on cancel/failure. Co-authored-by: Yago <yago@local> Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
…ed-region decode Ported from archived upstream PR siddharthvaddem#682. The stall check compared against the last encoder output time, so long decode-and-discard stretches over trim regions tripped the 15s timeout and aborted the export. The timer now measures only time actually spent waiting on a full encode queue. Co-authored-by: もりこ <moriko19971224@gmail.com> Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Ported from archived upstream PR siddharthvaddem#678. Design doc for an openscreen-export-helper child process (decode -> GPU composite -> HW encode -> mux) with per-platform encoder priority and a phased delivery roadmap. Kept as the export-performance roadmap now that upstream is archived. Co-authored-by: Kelly Yang <124ykl@gmail.com> Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
…fork files Browser tests expect export() to reject with BackgroundLoadError when the wallpaper fails to load; the fork's exporters (taken wholesale in merge #1) swallowed it into { success: false }. Restore upstream's rethrow in both VideoExporter's encoder-retry loop and GifExporter. Also repo-wide biome format pass: CI lints all files, while lint-staged only ever formatted staged ones, leaving 5 errors in fork-only files. The failing 'notify' check (upstream's PR-to-Discord sync) needs Discord secrets the fork doesn't have; workflow disabled via API (disabled_manually), file kept for a future fork Discord. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
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
1 participant
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.
Upstream
siddharthvaddem/openscreenis now archived; this brings the fork fully up to date with its final state and harvests the valuable orphaned PRs.Upstream merge (
8e55b12)54 commits: in-browser auto-captions (Whisper, bundled model), 17 custom cursor themes, reactive PiP zoom, webcam mirror toggle, cursor-smoothing rewrite, remember-last-folder, record-permissions prompt, waveform/CI fixes.
Union resolution keeps all fork features (segmented webcam, focus regions, subtitles, corner/stack presets). Decisions:
BLUR_REGIONS_ENABLED = false) matching upstream.Additional commits
1f5afa9— restore upstream's source-copy fast path (unedited MP4 exports return source bytes; fixes the 4 failing videoExporter tests; fork-specific blockers for webcam segments + subtitles).a61ffe1— port archived-upstream PR fix(recording): stream native-capture webcam to disk to prevent OOM crash on stop siddharthvaddem/openscreen#687: stream native webcam sidecar to disk (OOM/data-loss fix).f2f780f— port PR Fix video export stall when trim regions cause long decoder gaps siddharthvaddem/openscreen#682: fix false-positive encoder-stall abort with large trim regions.d06a58c— port PR docs: add native C++ export engine architecture plan siddharthvaddem/openscreen#678: native C++ export engine design doc.Verification
tsc --noEmit— 0 errorsvite build— renderer + electron + preload OKi18n-check— all 12 locales match en across 7 namespacesvitest— 225/225 passing (was 221 + 4 pre-existing failures)🤖 Generated with Claude Code