Commit Graph
18 Commits
Author SHA1 Message Date
TheM14 a2471ce502 Compile the fork decoder against the kernel that takes one HRTF input
ad_joc.c still asked the stream config for hrtf_sofa_path, hrtf_cache_dir and
hrtf_cache_policy, which the kernel no longer has; the same file is compiled by
the Windows and the Android build, so both stopped there.

The decoder now recognises only the Rosella model -- a JSON file containing a
personalized_hrtf object -- and passes its path to personalized_headphone_path.
The SOFA magic sniffing, the .jochrtf extension branch, the default cache
directory and the disk-cache retry path are gone, the default lookup is
HRTF/binaural.personalized_headphone, and the format warning for the frame length
uses %zu. The README, the fork docs and the example configs name the model file
instead of binaural.sofa.
2026-11-01 19:59:08 +08:00
TheM14 19b4a49407 Drop the HRTF source and cache options
The kernel renders the Rosella .personalized_headphone model or an already
compiled .jochrtf field, and only the first is a user-facing input: the SOFA
reader and its compile cache left the library. joc-hrtf-source, joc-hrtf-cache
and joc-hrtf-cache-dir go with them, and the default file is now
binaural.personalized_headphone only.

The plugin sets personalized_headphone_path directly, and the disk-cache retry
path disappears with the cache itself. The headers in third_party/joc/include
and fork/files/audio/decode follow the new kernel, so the config structs no
longer carry hrtf_sofa_path, hrtf_cache_policy, hrtf_cache_dir or hrtf_radius_m,
and the rosella filterbank no longer needs its SOFA exception.

The example config and the option tables in both READMEs drop the removed keys.
Builds against the kernel with tools/build.ps1 -JocCoreSource.
2026-11-01 19:38:41 +08:00
TheM14 0b94c75fd6 Match the packaged libraries line by line in the APK check
The listing comes from unzip -l, so entries are newline separated; the
glob compare used spaces and reported every library as missing even
though the APK was complete.
2026-10-31 04:07:47 +08:00
TheM14 f371dc0224 Do not source path.sh when building the JNI bridge
path.sh reads $cores before setting it, which aborts under set -u; the
step only needs depinfo.sh for the NDK version, and ndk-build is told
the job count directly.
2026-10-31 03:57:58 +08:00
TheM14 5ddbd6154b Build the JNI bridge for the Android app
The app's MPVLib loads libplayer.so before libmpv, and mpv-android builds
that bridge with ndk-build over app/src/main/jni, installing it and the
prebuilt ffmpeg/mpv objects into app/src/main/libs/<abi>. The workflow
only built the mpv target and then ran Gradle, so the APK shipped
without libplayer.so and every playback died with UnsatisfiedLinkError.

Run ndk-build the way buildscripts/scripts/mpv-android.sh does, and write
ndk.properties, which the Gradle build needs to find the NDK for symbol
stripping (the previous APK carried 134 MB of unstripped libraries).
2026-10-31 03:52:57 +08:00
TheM14 8673a3b762 Package the ffmpeg shared libraries the Android build links against
The Android libmpv.so has DT_NEEDED entries for libavcodec, libavfilter,
libavformat, libavutil, libswresample, libswscale and libavdevice, but
the app only carried libmpv.so, libjoc_core.so and libc++_shared.so, so
the linker rejected libmpv at dlopen time and the player crashed on
every file.

Copy every shared object from the cross-build prefix into the app's
libs/<abi> directory, and into the standalone library artifact too,
instead of naming the three files.
2026-10-31 03:33:27 +08:00
TheM14 8ed49a1170 Locate the Android SDK and the library directory the way the build
system lays them out

download-sdk.sh unpacks the SDK as buildscripts/sdk/android-sdk-linux,
and mpv-android keeps the libraries in app/src/main/libs with jniLibs
pointing at it. Check those names first, fall back to a platforms/
search, and write the libraries into libs/<abi> while recreating the
alias.
2026-10-31 03:05:03 +08:00
TheM14 68fc020260 Replace the dangling jniLibs link before copying the libraries
mpv-android ships app/src/main/jniLibs as a symlink for the ABI its own
build wants, so mkdir -p fails with "File exists" when the link target
does not exist. Replace the link (or file) with a plain directory and
copy the three libraries into arm64-v8a/.
2026-10-31 02:55:20 +08:00
TheM14 c45808135d Package the Android build as an installable APK
The arm64 job stopped at the three shared libraries, so the only way to
use them was to build a player around them. Let the libraries go into
mpv-android's jniLibs and let Gradle assemble and sign the app instead.

- copy libmpv.so, libjoc_core.so and libc++_shared.so into
  app/src/main/jniLibs/arm64-v8a
- locate the SDK under buildscripts/sdk, accept its licences, and link
  the unpacked NDK where AGP looks for it
- run assembleRelease with a throwaway injected signing key, so the APK
  installs without repository secrets
- verify the signature when apksigner is available and upload the APK as
  mpv-joc-android-arm64-v8a-apk, keeping the bare libraries as before
- cache the Gradle home between runs
- document the artifact and how to pass the ad_joc options

Checked locally: the workflow parses and every shell block passes
bash -n; the Gradle build itself needs a CI run.
2026-10-31 02:47:40 +08:00
TheM14 ecf14d8c32 Sync the Rosella filterbank choice into the plugin and the fork
The kernel can now render the Rosella path through either bank; expose
that choice in both front ends with the same values and the same
default.

- plugin: joc-rosella-filterbank = 1|2 (public|captured); unset means
  the kernel default (the public bank), and it applies only to
  joc-hrtf-source=rosella, logging a warning otherwise
- fork: --ad-joc-rosella-filterbank, the same values and default; it
  sits in the ad_joc option group, so it is read only when ad_joc
  decodes a Rosella model
- log the bank actually selected (public|captured) on both paths
- add a bank-2 case to tools/verify_parity.ps1
- document the key in both READMEs and the example config

Checked: the plugin builds, the option parser covers the numeric and
named spellings plus invalid values, and for both banks the plugin's
PCM is bit-identical to joc_cli with --rosella-filterbank 1|2.
2026-10-31 02:29:23 +08:00
TheM14 a9cbffa1cf Synchronize the kernel headers with the upstream repository
The kernel replaced the reserved words with rosella_filterbank and
bumped the task config version to 4; joc_task_config and
joc_stream_config keep their sizes, so the ABI stays compatible.

- Update third_party/joc/include/joc_core.h and joc_stream.h
- Update the copies ad_joc compiles against in
  fork/files/audio/decode/

tools/verify_kernel.ps1 reports the public headers byte-identical to
the upstream checkout.
2026-10-31 02:29:01 +08:00
TheM14 c22fa692f8 Synchronize the kernel version headers with the upstream repository 2026-10-30 04:21:17 +08:00
TheM14 78f2c4b4bd Serve the renderer's channel order without touching the player's layout 2026-10-29 01:09:55 +08:00
TheM14 95c4626abd Build the Windows fork in UCRT64, where LuaJIT is still published 2026-10-28 00:31:28 +08:00
TheM14 7d013fef46 Support the two 4.0 layouts in the plugin and the fork 2026-10-27 23:52:43 +08:00
TheM14 9a9bb7b0c8 Add android test build file and fix windows build file 2026-10-18 21:59:32 +08:00
TheM14 36c8ec3a7c Enhance build workflow with optional mpv_ref input 2026-10-18 21:43:59 +08:00
TheM14 126e2cd233 Init mpv-joc 2026-10-18 21:31:38 +08:00