mirror of
https://github.com/saphid/frame-control.git
synced 2026-10-06 02:00:19 +02:00
saphidandClaude Opus 5.5
a992f6d896
- The 10 s watchdog no longer ends idle sessions. PipeWire and WGC deliver frames only on damage; fail only when a frame entered the encoder and never came out, or the pipeline never produced its initial frame. - Controller.state/call/update are inert after close(), so a /status poll racing Stop cannot dereference the freed native controller. - Malformed viewer fields drop the event instead of ending the session. - PATH/LD_LIBRARY_PATH prepends add no empty (current directory) entry. - portal.c: document fd ownership. pipewiresrc dups the fd it is given (gstpipewirecore.c, F_DUPFD_CLOEXEC), so the portal closing its own fd is correct; clear it after close. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
91 lines
3.4 KiB
Python
91 lines
3.4 KiB
Python
"""PC host selection behind the existing MacView tunnel/panel controller.
|
|
|
|
The public /api/macview name and viewer URL remain compatible with the Mac
|
|
base branch. Only helper launch, platform availability and source validation
|
|
are different. No second viewer, SSH supervisor or benchmark launcher.
|
|
"""
|
|
import os
|
|
import sys
|
|
import subprocess
|
|
from frame_macview import MacView, MacViewError, ROOT
|
|
from frame_pc_capture import LIBRARY, NATIVE
|
|
|
|
|
|
def prepend(env, name, path):
|
|
"""An empty entry means the current directory to the loader; never add one."""
|
|
rest = env.get(name, '')
|
|
env[name] = str(path) + (os.pathsep + rest if rest else '')
|
|
|
|
|
|
class PCView(MacView):
|
|
viewer_profile = 'pc-view'
|
|
host = 'windows' if sys.platform == 'win32' else 'linux'
|
|
|
|
def __init__(self, *args, **kwargs):
|
|
super().__init__(*args, **kwargs)
|
|
self.prefer_usb = False # Mac networksetup probe is platform-specific
|
|
|
|
def unavailable(self):
|
|
if sys.platform not in ('win32', 'linux'):
|
|
return 'PC streaming needs Windows or a Linux desktop.'
|
|
if not LIBRARY.is_file():
|
|
return 'The PC streaming libraries are missing from this build. See docs/pc-in-headset.md.'
|
|
return None
|
|
|
|
def state(self):
|
|
result = super().state()
|
|
result["host"] = self.host
|
|
return result
|
|
|
|
def build(self):
|
|
pass # native libraries are built and bundled with the app
|
|
|
|
def agent_command(self):
|
|
return [sys.executable, str(ROOT / 'ui' / 'frame_pc_agent.py')]
|
|
|
|
def agent_environment(self):
|
|
env = super().agent_environment()
|
|
env['GST_PLUGIN_PATH_1_0'] = str(NATIVE / 'lib' / 'gstreamer-1.0')
|
|
env['GST_PLUGIN_SYSTEM_PATH_1_0'] = ''
|
|
cache = os.path.join(os.path.expanduser('~'), '.cache', 'frame-control')
|
|
os.makedirs(cache, exist_ok=True)
|
|
env['GST_REGISTRY_1_0'] = os.path.join(cache, 'gstreamer-registry.bin')
|
|
env['GST_REGISTRY_FORK'] = 'no'
|
|
if sys.platform == 'win32':
|
|
prepend(env, 'PATH', NATIVE / 'bin')
|
|
else:
|
|
prepend(env, 'LD_LIBRARY_PATH', NATIVE / 'lib')
|
|
env['PIPEWIRE_MODULE_DIR'] = str(NATIVE / 'lib' / 'pipewire-0.3')
|
|
env['SPA_PLUGIN_DIR'] = str(NATIVE / 'lib' / 'spa-0.2')
|
|
env['PIPEWIRE_CONFIG_DIR'] = str(NATIVE / 'share' / 'pipewire')
|
|
env['PIPEWIRE_CONFIG_NAME'] = 'client.conf'
|
|
return env
|
|
|
|
def shutdown(self):
|
|
self.closing = True
|
|
try:
|
|
self.stop()
|
|
except MacViewError:
|
|
pass
|
|
if self.tunnel and self.tunnel.poll() is None:
|
|
self.tunnel.terminate()
|
|
if self.agent and self.agent.poll() is None:
|
|
# EOF gives the host a chance to release held input and portal
|
|
# sessions, including on Windows where terminate is uncatchable.
|
|
if self.agent.stdin:
|
|
self.agent.stdin.close()
|
|
try:
|
|
self.agent.wait(10)
|
|
except subprocess.TimeoutExpired:
|
|
self.agent.kill()
|
|
self.agent.wait(5)
|
|
|
|
def _show(self, src, quality, width, height):
|
|
if src.startswith('separate:'):
|
|
raise MacViewError('Separate virtual displays are a Mac-only feature. Choose a window or screen.')
|
|
return super()._show(src, quality, width, height)
|
|
|
|
|
|
def host_view(*args, **kwargs):
|
|
return (MacView if sys.platform == 'darwin' else PCView)(*args, **kwargs)
|