bf8a974e8b
ci / rust (push) Has been cancelled
The clients/apple scaffold is now a working macOS client, validated live against this repo's host across the LAN: gamescope virtual output → NVENC HEVC → lumen/1 (GF(2¹⁶) FEC + AES-GCM over UDP, QUIC control) → VideoToolbox → AVSampleBufferDisplayLayer at 720p60, mouse/keyboard flowing back as QUIC datagrams into the host's gamescope EIS injector (~3.7k events injected in one session). LumenKit: - LumenConnection: the predicted cbindgen compile fixes (C17 header spells the typedefs as integers while the enum constants import as a distinct Swift type — bridge by rawValue); close() is now safe from any thread (a close flag + pumpLock held across the blocking poll enforce the C contract "never close with a next_au in flight"; flag prevents lock-starvation by back-to-back polls). - StreamView: per-pump cancellation token (reconnects can't double-pump), flush + re-gate on the next in-band parameter sets when the layer fails, no stale enqueue after restart. - InputCapture: fractional-delta accumulation (sub-pixel motion isn't truncated away), pressed-state tracking with release-all on focus loss and stop() (nothing sticks down host-side), global-singleton ownership guard (GC has one handler slot per process), X1/X2 buttons, horizontal scroll, full keypad/CapsLock/ISO-102nd/PrintScreen/Menu VKs. - LumenClient app shell (swift run LumenClient): connect form, fps/Mb-s HUD, LUMEN_AUTOCONNECT/LUMEN_MODE for scripted first-light runs. - Tests: Annex-B byte-level units; real-codec round trip (VTCompressionSession-encoded HEVC rebuilt as the host's wire shape → AnnexB → VTDecompressionSession → pixels); test-loopback.sh (Swift client vs a real local m3-host over loopback — the Swift twin of c_abi_connection_roundtrip); RemoteFirstLightTests (full pipeline over the LAN). Host/build fixes that fell out: - The workspace builds on non-Linux again: gamestream audio (opus) and sendmmsg batching are now platform-gated with stubs/fallback, per the crate's "compiles everywhere" rule. - Horizontal scroll was inverted end-to-end: the injectors negated BOTH axes onto the ei/wl axes, but GameStream's horizontal convention is positive = right (moonlight-qt/Sunshine pass it through unnegated) — only vertical flips now. This also un-inverts real Moonlight clients. - AnnexB drops all zeros preceding a start code (trailing_zero_8bits padding), ffmpeg's policy, instead of leaking them into the preceding NAL. - build-xcframework.sh: deployment targets pinned to the package floor + an otool guard — cargo does not fingerprint MACOSX_DEPLOYMENT_TARGET, so warm caches can silently ship too-new minos objects. Adversarially reviewed (5-dimension multi-agent pass, every finding refutation-verified): 14 confirmed findings, all fixed above; the send-while-polling core-contract gap flagged here is closed by the lumen/1 session-planes work (&self pulls + per-plane borrow slots). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
147 lines
6.2 KiB
Swift
147 lines
6.2 KiB
Swift
// Annex-B HEVC → CoreMedia plumbing.
|
|
//
|
|
// The lumen host emits Annex-B access units with in-band VPS/SPS/PPS on every IDR
|
|
// (deliberately — the client needs no out-of-band extradata). VideoToolbox wants the AVCC
|
|
// flavor instead: a CMVideoFormatDescription built from the parameter sets, and sample
|
|
// buffers whose NALs are 4-byte-length-prefixed. This file converts between the two.
|
|
//
|
|
// SCAFFOLD: written on the Linux host, not yet compiled against Xcode.
|
|
|
|
import CoreMedia
|
|
import Foundation
|
|
|
|
public enum AnnexB {
|
|
/// Split an Annex-B stream into NAL units (start codes 00 00 01 / 00 00 00 01 stripped).
|
|
/// All zeros immediately preceding a start code are dropped: they're either the
|
|
/// 4-byte-code prefix or `trailing_zero_8bits` padding, never NAL payload (emulation
|
|
/// prevention keeps 00 00 0x out of conforming NAL bytes) — same policy as ffmpeg.
|
|
public static func nalUnits(in data: Data) -> [Data] {
|
|
var nals: [Data] = []
|
|
let bytes = [UInt8](data)
|
|
var i = 0
|
|
var start = -1
|
|
while i + 2 < bytes.count {
|
|
if bytes[i] == 0, bytes[i + 1] == 0, bytes[i + 2] == 1 {
|
|
var codeStart = i
|
|
while codeStart > 0, bytes[codeStart - 1] == 0 {
|
|
codeStart -= 1
|
|
}
|
|
if start >= 0, start < codeStart {
|
|
nals.append(Data(bytes[start..<codeStart]))
|
|
}
|
|
start = i + 3
|
|
i += 3
|
|
} else {
|
|
i += 1
|
|
}
|
|
}
|
|
if start >= 0, start < bytes.count {
|
|
nals.append(Data(bytes[start...]))
|
|
}
|
|
return nals
|
|
}
|
|
|
|
/// HEVC NAL unit type (bits 1..6 of the first byte).
|
|
public static func hevcNalType(_ nal: Data) -> UInt8 {
|
|
guard let first = nal.first else { return 0xFF }
|
|
return (first >> 1) & 0x3F
|
|
}
|
|
|
|
/// Build a format description from an IDR AU's in-band VPS(32)/SPS(33)/PPS(34).
|
|
/// Returns nil when the AU carries no parameter sets (non-IDR).
|
|
public static func formatDescription(fromIDR au: Data) -> CMVideoFormatDescription? {
|
|
var vps: Data?, sps: Data?, pps: Data?
|
|
for nal in nalUnits(in: au) {
|
|
switch hevcNalType(nal) {
|
|
case 32: vps = nal
|
|
case 33: sps = nal
|
|
case 34: pps = nal
|
|
default: break
|
|
}
|
|
}
|
|
guard let vps, let sps, let pps else { return nil }
|
|
|
|
var format: CMVideoFormatDescription?
|
|
let sets = [vps, sps, pps]
|
|
let status: OSStatus = sets[0].withUnsafeBytes { v in
|
|
sets[1].withUnsafeBytes { s in
|
|
sets[2].withUnsafeBytes { p in
|
|
let pointers: [UnsafePointer<UInt8>] = [
|
|
v.bindMemory(to: UInt8.self).baseAddress!,
|
|
s.bindMemory(to: UInt8.self).baseAddress!,
|
|
p.bindMemory(to: UInt8.self).baseAddress!,
|
|
]
|
|
let sizes = [vps.count, sps.count, pps.count]
|
|
return CMVideoFormatDescriptionCreateFromHEVCParameterSets(
|
|
allocator: kCFAllocatorDefault,
|
|
parameterSetCount: 3,
|
|
parameterSetPointers: pointers,
|
|
parameterSetSizes: sizes,
|
|
nalUnitHeaderLength: 4,
|
|
extensions: nil,
|
|
formatDescriptionOut: &format)
|
|
}
|
|
}
|
|
}
|
|
return status == noErr ? format : nil
|
|
}
|
|
|
|
/// Re-pack an Annex-B AU as AVCC (4-byte big-endian length before each NAL), dropping
|
|
/// the parameter-set NALs (they live in the format description).
|
|
public static func avcc(from au: Data) -> Data {
|
|
var out = Data(capacity: au.count + 16)
|
|
for nal in nalUnits(in: au) {
|
|
let t = hevcNalType(nal)
|
|
if t == 32 || t == 33 || t == 34 { continue } // VPS/SPS/PPS
|
|
var len = UInt32(nal.count).bigEndian
|
|
withUnsafeBytes(of: &len) { out.append(contentsOf: $0) }
|
|
out.append(nal)
|
|
}
|
|
return out
|
|
}
|
|
|
|
/// Wrap one AU as a decode-ready CMSampleBuffer.
|
|
public static func sampleBuffer(
|
|
au: AccessUnit, format: CMVideoFormatDescription
|
|
) -> CMSampleBuffer? {
|
|
let avccData = avcc(from: au.data)
|
|
var blockBuffer: CMBlockBuffer?
|
|
guard CMBlockBufferCreateWithMemoryBlock(
|
|
allocator: kCFAllocatorDefault, memoryBlock: nil,
|
|
blockLength: avccData.count, blockAllocator: kCFAllocatorDefault,
|
|
customBlockSource: nil, offsetToData: 0, dataLength: avccData.count,
|
|
flags: 0, blockBufferOut: &blockBuffer) == noErr,
|
|
let block = blockBuffer
|
|
else { return nil }
|
|
let copied = avccData.withUnsafeBytes { raw in
|
|
CMBlockBufferReplaceDataBytes(
|
|
with: raw.baseAddress!, blockBuffer: block,
|
|
offsetIntoDestination: 0, dataLength: avccData.count)
|
|
}
|
|
guard copied == noErr else { return nil }
|
|
|
|
var timing = CMSampleTimingInfo(
|
|
duration: .invalid,
|
|
presentationTimeStamp: CMTime(value: Int64(au.ptsNs), timescale: 1_000_000_000),
|
|
decodeTimeStamp: .invalid)
|
|
var sampleSize = avccData.count
|
|
var sample: CMSampleBuffer?
|
|
guard CMSampleBufferCreate(
|
|
allocator: kCFAllocatorDefault, dataBuffer: block, dataReady: true,
|
|
makeDataReadyCallback: nil, refcon: nil, formatDescription: format,
|
|
sampleCount: 1, sampleTimingEntryCount: 1, sampleTimingArray: &timing,
|
|
sampleSizeEntryCount: 1, sampleSizeArray: &sampleSize,
|
|
sampleBufferOut: &sample) == noErr
|
|
else { return nil }
|
|
// Low-latency display: render on arrival, don't wait for a clock.
|
|
if let attachments = CMSampleBufferGetSampleAttachmentsArray(sample!, createIfNecessary: true) {
|
|
let dict = unsafeBitCast(CFArrayGetValueAtIndex(attachments, 0), to: CFMutableDictionary.self)
|
|
CFDictionarySetValue(
|
|
dict,
|
|
Unmanaged.passUnretained(kCMSampleAttachmentKey_DisplayImmediately).toOpaque(),
|
|
Unmanaged.passUnretained(kCFBooleanTrue).toOpaque())
|
|
}
|
|
return sample
|
|
}
|
|
}
|