mirror of
https://github.com/vitorpamplona/amethyst.git
synced 2026-08-08 23:54:39 +00:00
nrobi144
eae1ed88ec
Correctness fixes in GlobalMediaPlayer.kt
- snapshotFlow { hasMedia } collector for initial seek used `return@collect`
which only exits the lambda; the collector kept running and each
subsequent playVideo() call accumulated a live collector that would
re-fire a stale seekTo() on the wrong media. Replaced with `Flow.first`
which terminates the collection cleanly.
- playVideo()/playAudio() reset the public MediaPlaybackState to
volume=100/isMuted=false on a new URL, but the kdroidFilter player
retains its `volume` across openUri(); muting one track and starting a
new one left the engine silent while the UI showed unmuted. Reset
`player.volume = 1f` to match the public state.
- ensureVideoPlayer()/ensureAudioPlayer() called createVideoPlayerState()
synchronously from the Compose getter; if native init throws (missing
GStreamer on Linux, broken NativeLibraryLoader extraction) the whole
window would crash. Wrapped in runCatching and changed
activeVideoPlayerState to nullable. Consumers in DesktopVideoPlayer
and GlobalFullscreenOverlay handle the null path by rendering the
thumbnail / blank backdrop respectively; playVideo()/playAudio()
surface "Video playback unavailable" through the existing
errorReason -> PlaybackErrorMessage path.
Crash mitigation (kdroidFilter 0.10.0 UAF in MacVideoPlayerSurface)
- NowPlayingBar previously mounted a SECOND VideoPlayerSurface against
the same VideoPlayerState while the feed card was already mounting
one, doubling the draw rate against the shared frame bitmap and
widening the UAF window in MacVideoPlayerSurface's RasterFromBitmap
path. Mini-preview now renders the cached thumbnail (or the music
icon fallback). 0.10.1 contains an upstream fix
("recover video playback after composition removal") but is not yet
on Maven Central — single-surface mounting is the only mitigation
we can ship today.
VideoThumbnailCache.kt
- Truncated-download cache poisoning: when an origin ignored the
Range: header and returned HTTP 200 with the full body, we capped
the copy at MAX_THUMB_BYTES and persisted the truncated file
forever. Subsequent thumbnail attempts hit the broken cache file
and re-failed JCodec/ffmpeg every time. Tag download results with
whether the server actually returned 206; on 200, extract from the
temp file and delete it (no persistent cache hit).
- Tor bypass: replaced the bare OkHttpClient with
DesktopHttpClient.currentClient() so thumbnail fetches respect the
user's Tor preference (fail-closed when Tor is expected but
bootstrapping).
- ffmpeg version probe leaked the process on hang: now drains stdout
to DISCARD and calls destroyForcibly() on timeout.
- Frame-extract ffmpeg subprocess could deadlock on a chatty stderr
pipe: redirectError(DISCARD) so we never wait on stderr; a finally
block destroys the process if anything leaked through the timeout.
CI workflow cleanup
- Removed vlc-setup download cache + pre-fetch steps from
build.yml and smoke-test-desktop.yml. They were targeting an
ir.mahozad.vlc-setup plugin we no longer apply, so they wasted
~minutes of CI time per leg and tied the build to videolan.org
reachability for no reason.
- Trimmed create-release.yml's stale VLC-plugins justification on
the linuxdeploy-vs-appimagetool comment.
.gitignore + missing per-OS ffmpeg READMEs
- The pre-PR rules blanket-ignored desktopApp/src/jvmMain/appResources/{linux,macos,windows}/
so the LGPL FFmpeg drop-in slot READMEs created in 704f4f44e never
reached the commit. Refined the ignore rules to keep stale vlc/ workspace
trees out of git (still ignored) while explicitly tracking the
ffmpeg/README.md drop-in slot under each OS. The READMEs document the
recommended LGPL build source per OS for the bundled-FFmpeg packaging
path.
Verified on macOS arm64:
./gradlew :desktopApp:compileKotlin BUILD SUCCESSFUL
./gradlew :desktopApp:test BUILD SUCCESSFUL
./gradlew :desktopApp:spotlessApply clean
Refs PR #3175 review by @davotoula.
193 lines
4.1 KiB
Plaintext
193 lines
4.1 KiB
Plaintext
/local.properties
|
|
/.idea/caches
|
|
/.idea/libraries
|
|
/.idea/modules.xml
|
|
/.idea/workspace.xml
|
|
/.idea/navEditor.xml
|
|
/.idea/assetWizardSettings.xml
|
|
/.idea/androidTestResultsUserPreferences.xml
|
|
/.idea/deploymentTargetDropDown.xml
|
|
/.idea/deploymentTargetSelector.xml
|
|
/.idea/appInsightsSettings.xml
|
|
/.idea/ktlint-plugin.xml
|
|
/.idea/ktfmt.xml
|
|
/.idea/studiobot.xml
|
|
/.idea/other.xml
|
|
/.idea/runConfigurations.xml
|
|
/.idea/ChatHistory_schema_v2.xml
|
|
/.idea/artifacts/*
|
|
/.idea/kotlinNotebook.xml
|
|
/.idea/ChatHistory_schema_v3.xml
|
|
/.idea/markdown.xml
|
|
/.idea/AndroidProjectSystem.xml
|
|
/.idea/deviceManager.xml
|
|
/.idea/inspectionProfiles/
|
|
/.idea/migrations.xml
|
|
/.idea/planningMode.xml
|
|
/desktopApp/vlc-temp/
|
|
/commons/.idea/gradle.xml
|
|
/commons/.idea/misc.xml
|
|
/commons/.idea/workspace.xml
|
|
/quartz/.idea/modules.xml
|
|
/quartz/.idea/workspace.xml
|
|
.DS_Store
|
|
/build
|
|
/captures
|
|
.cxx
|
|
|
|
# superpowers skill
|
|
.superpowers
|
|
docs/brainstorms
|
|
docs/superpowers
|
|
|
|
# Built application files
|
|
*.apk
|
|
*.aar
|
|
*.ap_
|
|
*.aab
|
|
|
|
# Files for the ART/Dalvik VM
|
|
*.dex
|
|
|
|
# Java class files
|
|
*.class
|
|
|
|
# Generated files
|
|
bin/
|
|
gen/
|
|
out/
|
|
# Uncomment the following line in case you need and you don't have the release build type files in your app
|
|
# release/
|
|
|
|
# Gradle files
|
|
.gradle
|
|
.gradle/
|
|
build/
|
|
.kotlin/
|
|
|
|
# Local configuration file (sdk path, etc)
|
|
local.properties
|
|
|
|
# Proguard folder generated by Eclipse
|
|
proguard/
|
|
|
|
# Log Files
|
|
*.log
|
|
|
|
# Android Studio
|
|
/*/build/
|
|
/*/local.properties
|
|
/*/out
|
|
/*/*/build
|
|
/*/*/production
|
|
captures/
|
|
.navigation/
|
|
*.ipr
|
|
*~
|
|
*.swp
|
|
|
|
# IntelliJ
|
|
*.iml
|
|
*.iws
|
|
/out/
|
|
deploymentTargetDropdown.xml
|
|
render.experimental.xml
|
|
|
|
# User-specific configurations
|
|
.idea/**/caches/
|
|
.idea/**/libraries/
|
|
.idea/**/shelf/
|
|
.idea/**/codeStyles
|
|
.idea/**/workspace.xml
|
|
.idea/**/tasks.xml
|
|
.idea/**/.name
|
|
.idea/**/compiler.xml
|
|
.idea/**/copyright/profiles_settings.xml
|
|
.idea/**/encodings.xml
|
|
.idea/**/misc.xml
|
|
.idea/**/modules.xml
|
|
.idea/**/scopes/scope_settings.xml
|
|
.idea/**/dictionaries
|
|
.idea/**/vcs.xml
|
|
.idea/**/jsLibraryMappings.xml
|
|
.idea/**/datasources.xml
|
|
.idea/**/dataSources.ids
|
|
.idea/**/sqlDataSources.xml
|
|
.idea/**/dynamic.xml
|
|
.idea/**/uiDesigner.xml
|
|
.idea/**/assetWizardSettings.xml
|
|
.idea/**/gradle.xml
|
|
.idea/**/jarRepositories.xml
|
|
.idea/**/navEditor.xml
|
|
|
|
# Keystore files
|
|
# Uncomment the following lines if you do not want to check your keystore files in.
|
|
#*.jks
|
|
#*.keystore
|
|
|
|
# External native build folder generated in Android Studio 2.2 and later
|
|
.externalNativeBuild
|
|
.cxx/
|
|
|
|
# Google Services (e.g. APIs or Firebase)
|
|
# google-services.json
|
|
|
|
# Freeline
|
|
freeline.py
|
|
freeline/
|
|
freeline_project_description.json
|
|
|
|
# fastlane
|
|
fastlane/report.xml
|
|
fastlane/Preview.html
|
|
fastlane/screenshots
|
|
fastlane/test_output
|
|
fastlane/readme.md
|
|
|
|
# Version control
|
|
vcs.xml
|
|
|
|
# lint
|
|
lint/intermediates/
|
|
lint/generated/
|
|
lint/outputs/
|
|
lint/tmp/
|
|
# lint/reports/
|
|
|
|
# Local task tracking
|
|
TASKS.md
|
|
|
|
# Claude Code local settings
|
|
.claude/settings.local.json
|
|
.claude/scheduled_tasks.lock
|
|
|
|
# Per-OS appResources slots — historically the ir.mahozad.vlc-setup plugin
|
|
# populated these with VLC binaries (no longer used; superseded by
|
|
# kdroidFilter ComposeMediaPlayer). We still ignore the directory contents
|
|
# by default to keep stale workspaces from accidentally bundling old VLC
|
|
# trees into local packages, but explicitly track the ffmpeg/README.md
|
|
# drop-in slot for the LGPL FFmpeg binaries used by VideoThumbnailCache.
|
|
desktopApp/src/jvmMain/appResources/linux/*
|
|
desktopApp/src/jvmMain/appResources/macos/*
|
|
desktopApp/src/jvmMain/appResources/windows/*
|
|
!desktopApp/src/jvmMain/appResources/linux/ffmpeg/
|
|
!desktopApp/src/jvmMain/appResources/macos/ffmpeg/
|
|
!desktopApp/src/jvmMain/appResources/windows/ffmpeg/
|
|
desktopApp/src/jvmMain/appResources/*/ffmpeg/*
|
|
!desktopApp/src/jvmMain/appResources/*/ffmpeg/README.md
|
|
|
|
# CI-fetched AppImage tooling (downloaded by create-release workflow; not committed)
|
|
desktopApp/packaging/appimage/appimagetool-x86_64.AppImage
|
|
desktopApp/packaging/appimage/squashfs-root/
|
|
|
|
# Git worktrees
|
|
.worktrees/
|
|
.claude/worktrees/
|
|
benchmark/src/main/jniLibs/
|
|
|
|
/tools/marmot-interop/state
|
|
|
|
# Cargo build artifacts for the cross-stack interop sidecars at
|
|
# nestsClient/tests/hang-interop/. Cargo.lock is committed (binary workspace).
|
|
/nestsClient/tests/hang-interop/target/
|