mirror of
https://github.com/saphid/frame-control.git
synced 2026-10-06 03:00:18 +02:00
Frame Control can now show any Mac window, or a whole screen, as its own SteamVR panel on the Steam Frame (Tools -> Mac in the headset, macOS only). Place it with the SteamVR dashboard; the laser clicks and scrolls, and the Mac's own keyboard types. - mac/frame-mac-view (Swift, no dependencies): ScreenCaptureKit capture per window or display, VideoToolbox H.264 with low-latency rate control (JPEG fallback), a loopback HTTP/WebSocket server, CGEvent/AX input playback, and a display-awake assertion while anyone watches. - ui/frame_macview.py: starts the agent, runs an ssh -R tunnel with a supervisor that reopens it on the same port, and launches a Chromium app window per stream on gamescope's :0, tagged with STEAM_GAME for its own panel. - Frame Control's key never leaves the Mac: viewers get single-use, per-source tickets and reconnect keys that Stop revokes. - ui/mac-view.html: WebCodecs decode, keyframe recovery, pointer/wheel/keys back. - Bundled in the Mac app build; tests/test_macview.py builds and drives the agent on macOS. Verified on the Frame (build 20260925.6191901) with the test pattern: panel in about 1.5 s, about 60 fps, Mac-to-window about 11-17 ms, tunnel recovery in 4 s. Laser input and real window capture still need a person in the headset. Also commits the other thread's first-party rule (steam-frame skill) and the first-party options table in docs/streaming.md. Reviewed by GPT-6 Astra (xhigh, read-only) over six rounds; all findings fixed. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
173 lines
7.9 KiB
Swift
173 lines
7.9 KiB
Swift
// VideoToolbox encoding: H.264 for the normal path (hardware, low-latency rate
|
|
// control, no B-frames, Annex B output that WebCodecs takes without a
|
|
// description), or JPEG stills for viewers that can't decode H.264.
|
|
import CoreMedia
|
|
import Foundation
|
|
import VideoToolbox
|
|
|
|
enum Codec: String {
|
|
case h264, jpeg
|
|
}
|
|
|
|
final class Encoder {
|
|
let codec: Codec
|
|
let fps: Int
|
|
let bitsPerPixel: Double
|
|
private(set) var width = 0
|
|
private(set) var height = 0
|
|
private var session: VTCompressionSession?
|
|
private var forceKey = true
|
|
private var lastPts = CMTime.invalid
|
|
/// Called on VideoToolbox's thread with one access unit (or JPEG) per frame.
|
|
var onFrame: ((Data, Bool, CMTime) -> Void)?
|
|
var onError: ((String) -> Void)?
|
|
/// Called once per frame handed to VideoToolbox, however it went.
|
|
var onDone: (() -> Void)?
|
|
|
|
init(codec: Codec, fps: Int, bitsPerPixel: Double) {
|
|
self.codec = codec
|
|
self.fps = fps
|
|
self.bitsPerPixel = bitsPerPixel
|
|
}
|
|
|
|
deinit { invalidate() }
|
|
|
|
func requestKeyFrame() { forceKey = true }
|
|
|
|
func invalidate() {
|
|
if let s = session {
|
|
VTCompressionSessionCompleteFrames(s, untilPresentationTimeStamp: .invalid)
|
|
VTCompressionSessionInvalidate(s)
|
|
}
|
|
session = nil
|
|
}
|
|
|
|
private func makeSession(width w: Int, height h: Int) -> Bool {
|
|
invalidate()
|
|
var spec: [CFString: Any] = [:]
|
|
if codec == .h264 { spec[kVTVideoEncoderSpecification_EnableLowLatencyRateControl] = true }
|
|
var s: VTCompressionSession?
|
|
let type = codec == .h264 ? kCMVideoCodecType_H264 : kCMVideoCodecType_JPEG
|
|
func create(_ spec: [CFString: Any]) -> OSStatus {
|
|
VTCompressionSessionCreate(allocator: nil, width: Int32(w), height: Int32(h), codecType: type,
|
|
encoderSpecification: spec as CFDictionary, imageBufferAttributes: nil,
|
|
compressedDataAllocator: nil, outputCallback: nil, refcon: nil,
|
|
compressionSessionOut: &s)
|
|
}
|
|
var err = create(spec)
|
|
// Low-latency rate control needs Apple's hardware encoder; without it
|
|
// (some VMs), plain real-time encoding still works.
|
|
if err != noErr, !spec.isEmpty { err = create([:]) }
|
|
guard err == noErr, let s else {
|
|
onError?("couldn't start the \(codec.rawValue) encoder (VideoToolbox \(err))")
|
|
return false
|
|
}
|
|
func set(_ key: CFString, _ value: Any) { VTSessionSetProperty(s, key: key, value: value as CFTypeRef) }
|
|
set(kVTCompressionPropertyKey_RealTime, true)
|
|
set(kVTCompressionPropertyKey_ColorPrimaries, kCVImageBufferColorPrimaries_ITU_R_709_2)
|
|
set(kVTCompressionPropertyKey_TransferFunction, kCVImageBufferTransferFunction_ITU_R_709_2)
|
|
set(kVTCompressionPropertyKey_YCbCrMatrix, kCVImageBufferYCbCrMatrix_ITU_R_709_2)
|
|
if codec == .h264 {
|
|
let bps = min(max(Double(w * h * fps) * bitsPerPixel, 2_000_000), 60_000_000)
|
|
set(kVTCompressionPropertyKey_ProfileLevel, kVTProfileLevel_H264_ConstrainedHigh_AutoLevel)
|
|
set(kVTCompressionPropertyKey_AllowFrameReordering, false)
|
|
set(kVTCompressionPropertyKey_AverageBitRate, Int(bps))
|
|
set(kVTCompressionPropertyKey_ExpectedFrameRate, fps)
|
|
// A keyframe every 10 s at most, so a viewer that lost one recovers
|
|
// even if it never asks. Viewers ask for one when they start.
|
|
set(kVTCompressionPropertyKey_MaxKeyFrameIntervalDuration, 10)
|
|
} else {
|
|
set(kVTCompressionPropertyKey_Quality, 0.8)
|
|
}
|
|
VTCompressionSessionPrepareToEncodeFrames(s)
|
|
session = s
|
|
lastPts = .invalid
|
|
width = w
|
|
height = h
|
|
forceKey = true
|
|
return true
|
|
}
|
|
|
|
/// False if the frame never reached VideoToolbox (then onDone won't come).
|
|
@discardableResult
|
|
func encode(_ pb: CVPixelBuffer, pts given: CMTime) -> Bool {
|
|
// VideoToolbox needs strictly increasing timestamps; a resent picture
|
|
// stamped "now" can be followed by a capture stamped a moment earlier.
|
|
var pts = given
|
|
if lastPts.isValid, CMTimeCompare(pts, lastPts) <= 0 { pts = CMTimeAdd(lastPts, CMTime(value: 1, timescale: 1_000_000)) }
|
|
let w = CVPixelBufferGetWidth(pb), h = CVPixelBufferGetHeight(pb)
|
|
if session == nil || w != width || h != height {
|
|
guard makeSession(width: w, height: h) else { return false }
|
|
}
|
|
guard let s = session else { return false }
|
|
var props: CFDictionary?
|
|
if forceKey {
|
|
props = [kVTEncodeFrameOptionKey_ForceKeyFrame: true] as CFDictionary
|
|
forceKey = false
|
|
}
|
|
let codec = self.codec
|
|
lastPts = pts
|
|
let status = VTCompressionSessionEncodeFrame(s, imageBuffer: pb, presentationTimeStamp: pts, duration: .invalid,
|
|
frameProperties: props, infoFlagsOut: nil) { [weak self] status, _, sample in
|
|
guard let self else { return }
|
|
defer { self.onDone?() }
|
|
guard status == noErr, let sample else { return }
|
|
if codec == .jpeg {
|
|
if let data = Self.bytes(sample) { self.onFrame?(data, true, pts) }
|
|
} else if let (data, key) = Self.annexB(sample) {
|
|
self.onFrame?(data, key, pts)
|
|
}
|
|
}
|
|
if status != noErr { forceKey = true }
|
|
return status == noErr
|
|
}
|
|
|
|
private static func bytes(_ sample: CMSampleBuffer) -> Data? {
|
|
guard let block = CMSampleBufferGetDataBuffer(sample) else { return nil }
|
|
var length = 0
|
|
var ptr: UnsafeMutablePointer<CChar>?
|
|
guard CMBlockBufferGetDataPointer(block, atOffset: 0, lengthAtOffsetOut: nil, totalLengthOut: &length,
|
|
dataPointerOut: &ptr) == noErr, let ptr else { return nil }
|
|
return Data(bytes: ptr, count: length)
|
|
}
|
|
|
|
/// AVCC sample -> Annex B access unit, with SPS and PPS before keyframes.
|
|
static func annexB(_ sample: CMSampleBuffer) -> (Data, Bool)? {
|
|
guard let avcc = bytes(sample) else { return nil }
|
|
var key = true
|
|
if let atts = CMSampleBufferGetSampleAttachmentsArray(sample, createIfNecessary: false) as? [[CFString: Any]],
|
|
let first = atts.first, first[kCMSampleAttachmentKey_NotSync] as? Bool == true {
|
|
key = false
|
|
}
|
|
let start: [UInt8] = [0, 0, 0, 1]
|
|
var out = Data()
|
|
if key, let fmt = CMSampleBufferGetFormatDescription(sample) {
|
|
var count = 0
|
|
CMVideoFormatDescriptionGetH264ParameterSetAtIndex(fmt, parameterSetIndex: 0, parameterSetPointerOut: nil,
|
|
parameterSetSizeOut: nil, parameterSetCountOut: &count,
|
|
nalUnitHeaderLengthOut: nil)
|
|
for i in 0..<count {
|
|
var p: UnsafePointer<UInt8>?
|
|
var n = 0
|
|
if CMVideoFormatDescriptionGetH264ParameterSetAtIndex(fmt, parameterSetIndex: i, parameterSetPointerOut: &p,
|
|
parameterSetSizeOut: &n, parameterSetCountOut: nil,
|
|
nalUnitHeaderLengthOut: nil) == noErr, let p {
|
|
out.append(contentsOf: start)
|
|
out.append(p, count: n)
|
|
}
|
|
}
|
|
}
|
|
let bytes = [UInt8](avcc)
|
|
var i = 0
|
|
while i + 4 <= bytes.count {
|
|
let n = Int(bytes[i]) << 24 | Int(bytes[i + 1]) << 16 | Int(bytes[i + 2]) << 8 | Int(bytes[i + 3])
|
|
i += 4
|
|
guard n > 0, i + n <= bytes.count else { break }
|
|
out.append(contentsOf: start)
|
|
out.append(contentsOf: bytes[i..<(i + n)])
|
|
i += n
|
|
}
|
|
return (out, key)
|
|
}
|
|
}
|