de7b8ac282
apple / swift (push) Successful in 53s
ci / rust (push) Failing after 55s
ci / web (push) Successful in 29s
ci / docs-site (push) Successful in 33s
android / android (push) Successful in 2m25s
ci / bench (push) Successful in 1m37s
decky / build-publish (push) Successful in 13s
docker / build-push (--build-arg FEDORA_VERSION=44, ci, ci/fedora-rpm.Dockerfile, punktfunk-fedora44-rpm) (push) Successful in 4s
docker / build-push (., web/Dockerfile, punktfunk-web) (push) Successful in 4s
docker / build-push (ci, ci/fedora-rpm.Dockerfile, punktfunk-fedora-rpm) (push) Successful in 4s
docker / build-push (ci, ci/rust-ci.Dockerfile, punktfunk-rust-ci) (push) Successful in 4s
docker / build-push (docs-site, docs-site/Dockerfile, punktfunk-docs) (push) Successful in 4s
flatpak / build-publish (push) Failing after 1s
rpm / build-publish (bazzite, punktfunk-fedora-rpm) (push) Failing after 3m49s
deb / build-publish (push) Successful in 5m55s
rpm / build-publish (fedora-44, punktfunk-fedora44-rpm) (push) Successful in 4m38s
docker / deploy-docs (push) Successful in 8s
M4 Android stage 1 (video). Pull HEVC access units from the connector and render them to the SurfaceView entirely in Rust (NDK AMediaCodec → ANativeWindow) — no per-frame JNI, honoring the native-thread hot-path invariant. - crates/punktfunk-android: decode.rs (one-in/one-out AMediaCodec loop; in-band VPS/SPS/PPS so no out-of-band csd; dims from NativeClient::mode). SessionHandle now holds an Arc<NativeClient> + the decode thread; nativeStartVideo/nativeStopVideo. - clients/android: connect screen (host/port) + full-screen SurfaceView stream screen — surfaceCreated -> nativeStartVideo, leaving -> stop + close. Verified live (Android emulator -> m3-host on the LAN box, ABI v2): QUIC handshake, 8-round clock-skew sync, HEVC decoder configured at 1280x720, and the data plane delivered + fed all 299 access units (the punktfunk/1 NAT hole-punch worked through the emulator's SLIRP). Real-pixel render is pending a non-synthetic source: `m3-host --source synthetic` emits dummy transport payloads (not HEVC), so the decoder correctly produces nothing; `--source virtual` (a compositor on the host) is needed to verify decode-to-screen. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
178 lines
6.1 KiB
Rust
178 lines
6.1 KiB
Rust
//! Session lifecycle + plane wiring over JNI.
|
|
//!
|
|
//! A connected session is a [`SessionHandle`] — an `Arc<NativeClient>` plus the decode thread it
|
|
//! feeds — boxed and handed to Kotlin as an opaque `jlong`. The connector is `Sync`, so the decode
|
|
//! thread pulls the video plane (`next_frame`) directly while Kotlin still holds the handle.
|
|
//!
|
|
//! Wired so far: connect/close + the video plane (HEVC `next_frame` → NDK AMediaCodec → the
|
|
//! SurfaceView's `ANativeWindow`, see [`crate::decode`]).
|
|
//!
|
|
//! TODO(M4 Android stage 1): audio (`next_audio` → Opus → Oboe), input (`send_input` /
|
|
//! `send_rich_input`), rumble/HID feedback, pairing/identity (Keystore). Port the orchestration
|
|
//! from `crates/punktfunk-client-linux`.
|
|
|
|
use jni::objects::{JObject, JString};
|
|
use jni::sys::{jint, jlong};
|
|
use jni::JNIEnv;
|
|
use punktfunk_core::client::NativeClient;
|
|
use punktfunk_core::config::{CompositorPref, GamepadPref, Mode};
|
|
use std::sync::atomic::{AtomicBool, Ordering};
|
|
use std::sync::{Arc, Mutex};
|
|
use std::thread::JoinHandle;
|
|
use std::time::Duration;
|
|
|
|
/// A live session behind the `jlong` handle: the connector + the decode thread it feeds.
|
|
pub(crate) struct SessionHandle {
|
|
// Read only by the android decode path (`nativeStartVideo` → `crate::decode`); on the host
|
|
// build (CI's workspace clippy/build) those readers are cfg'd out, so it's intentionally unused.
|
|
#[cfg_attr(not(target_os = "android"), allow(dead_code))]
|
|
pub client: Arc<NativeClient>,
|
|
video: Mutex<Option<VideoThread>>,
|
|
}
|
|
|
|
struct VideoThread {
|
|
shutdown: Arc<AtomicBool>,
|
|
join: Option<JoinHandle<()>>,
|
|
}
|
|
|
|
impl SessionHandle {
|
|
/// Signal the decode thread to stop and join it. Idempotent.
|
|
fn stop_video(&self) {
|
|
if let Some(mut vt) = self.video.lock().unwrap().take() {
|
|
vt.shutdown.store(true, Ordering::SeqCst);
|
|
if let Some(j) = vt.join.take() {
|
|
let _ = j.join();
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
impl Drop for SessionHandle {
|
|
fn drop(&mut self) {
|
|
self.stop_video();
|
|
}
|
|
}
|
|
|
|
/// `NativeBridge.nativeConnect(host, port, width, height, refreshHz): Long` — trust-on-first-use,
|
|
/// anonymous. Returns an opaque session handle, or `0` on failure (logged to logcat).
|
|
#[no_mangle]
|
|
pub extern "system" fn Java_io_unom_punktfunk_kit_NativeBridge_nativeConnect<'local>(
|
|
mut env: JNIEnv<'local>,
|
|
_this: JObject<'local>,
|
|
host: JString<'local>,
|
|
port: jint,
|
|
width: jint,
|
|
height: jint,
|
|
refresh_hz: jint,
|
|
) -> jlong {
|
|
let host: String = match env.get_string(&host) {
|
|
Ok(s) => s.into(),
|
|
Err(_) => return 0,
|
|
};
|
|
let mode = Mode {
|
|
width: width as u32,
|
|
height: height as u32,
|
|
refresh_hz: refresh_hz as u32,
|
|
};
|
|
match NativeClient::connect(
|
|
&host,
|
|
port as u16,
|
|
mode,
|
|
CompositorPref::Auto,
|
|
GamepadPref::Auto,
|
|
0, // bitrate_kbps: host default
|
|
None, // launch: default app
|
|
None, // pin: trust on first use
|
|
None, // identity: anonymous (TODO: Keystore-backed identity + pairing)
|
|
Duration::from_secs(10),
|
|
) {
|
|
Ok(client) => {
|
|
let handle = SessionHandle {
|
|
client: Arc::new(client),
|
|
video: Mutex::new(None),
|
|
};
|
|
Box::into_raw(Box::new(handle)) as jlong
|
|
}
|
|
Err(e) => {
|
|
log::error!("nativeConnect to {host}:{port} failed: {e}");
|
|
0
|
|
}
|
|
}
|
|
}
|
|
|
|
/// `NativeBridge.nativeClose(handle)` — drop the session (stops the decode thread, then RAII-tears
|
|
/// down the connector). No-op on `0`.
|
|
///
|
|
/// # Safety contract
|
|
/// `handle` must be `0` or a live handle from [`Java_io_unom_punktfunk_kit_NativeBridge_nativeConnect`],
|
|
/// closed exactly once and not concurrently with other calls on the same handle (Kotlin owns this).
|
|
#[no_mangle]
|
|
pub extern "system" fn Java_io_unom_punktfunk_kit_NativeBridge_nativeClose(
|
|
_env: JNIEnv,
|
|
_this: JObject,
|
|
handle: jlong,
|
|
) {
|
|
if handle != 0 {
|
|
// SAFETY: per the contract, `handle` is a live `Box<SessionHandle>` pointer.
|
|
unsafe { drop(Box::from_raw(handle as *mut SessionHandle)) };
|
|
}
|
|
}
|
|
|
|
/// `NativeBridge.nativeStartVideo(handle, surface)` — wrap the SurfaceView's `Surface` as an
|
|
/// `ANativeWindow` and start the HEVC decode thread rendering onto it. No-op if already started.
|
|
#[cfg(target_os = "android")]
|
|
#[no_mangle]
|
|
pub extern "system" fn Java_io_unom_punktfunk_kit_NativeBridge_nativeStartVideo(
|
|
env: JNIEnv,
|
|
_this: JObject,
|
|
handle: jlong,
|
|
surface: JObject,
|
|
) {
|
|
if handle == 0 {
|
|
return;
|
|
}
|
|
// SAFETY: live handle per the nativeConnect/nativeClose contract.
|
|
let h = unsafe { &*(handle as *const SessionHandle) };
|
|
let mut guard = h.video.lock().unwrap();
|
|
if guard.is_some() {
|
|
return; // already streaming
|
|
}
|
|
// SAFETY: `env`/`surface` are valid JNI pointers for this call. `as *mut _` bridges any
|
|
// jni-sys version skew between the `jni` and `ndk` crates (both are raw `*mut _` pointers).
|
|
let window = match unsafe {
|
|
ndk::native_window::NativeWindow::from_surface(
|
|
env.get_native_interface() as *mut _,
|
|
surface.as_raw() as *mut _,
|
|
)
|
|
} {
|
|
Some(w) => w,
|
|
None => {
|
|
log::error!("nativeStartVideo: no ANativeWindow from Surface");
|
|
return;
|
|
}
|
|
};
|
|
let shutdown = Arc::new(AtomicBool::new(false));
|
|
let client = h.client.clone();
|
|
let sd = shutdown.clone();
|
|
let join = std::thread::Builder::new()
|
|
.name("pf-decode".into())
|
|
.spawn(move || crate::decode::run(client, window, sd))
|
|
.ok();
|
|
*guard = Some(VideoThread { shutdown, join });
|
|
}
|
|
|
|
/// `NativeBridge.nativeStopVideo(handle)` — stop + join the decode thread (without closing the
|
|
/// session). No-op on `0`.
|
|
#[no_mangle]
|
|
pub extern "system" fn Java_io_unom_punktfunk_kit_NativeBridge_nativeStopVideo(
|
|
_env: JNIEnv,
|
|
_this: JObject,
|
|
handle: jlong,
|
|
) {
|
|
if handle != 0 {
|
|
// SAFETY: live handle per the contract.
|
|
let h = unsafe { &*(handle as *const SessionHandle) };
|
|
h.stop_video();
|
|
}
|
|
}
|