From 2c8f190bf1e1981813cb04b75b80d46fa79263f5 Mon Sep 17 00:00:00 2001 From: Christopher Warner Date: Tue, 13 Oct 2026 15:12:17 -0400 Subject: feat: ship video install path for ThinkPad/Intel users Add install-aerial-videos, LocalSend lite video pack builder, Intel VAAPI preference, and software x265/x264 encode fallbacks so a T480 can install clips via zip or Apple fetch without AMD-specific assumptions. Co-authored-by: Cursor --- aerial_screensaver.py | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) (limited to 'aerial_screensaver.py') diff --git a/aerial_screensaver.py b/aerial_screensaver.py index 4bc27c7..12727c9 100755 --- a/aerial_screensaver.py +++ b/aerial_screensaver.py @@ -42,20 +42,19 @@ def _load_config() -> dict[str, str]: return cfg -def _pci_class_for_render(render: Path) -> str | None: - """Return PCI class hex for a render node, e.g. '0x038000'.""" +def _pci_attrs_for_render(render: Path) -> tuple[str, str]: + """Return (pci_class, vendor) hex strings for a render node.""" try: device = Path("/sys/class/drm") / render.name / "device" - class_file = device / "class" - if class_file.is_file(): - return class_file.read_text(encoding="utf-8").strip() + cls = (device / "class").read_text(encoding="utf-8").strip() if (device / "class").is_file() else "" + vendor = (device / "vendor").read_text(encoding="utf-8").strip() if (device / "vendor").is_file() else "" + return cls, vendor except OSError: - return None - return None + return "", "" def find_vaapi_device(preferred: str | None = None) -> str | None: - """Pick a DRM render node for VAAPI. Prefer iGPU when hybrid AMD/Intel.""" + """Pick a DRM render node for VAAPI. Prefer iGPU (Intel / AMD display).""" if preferred and Path(preferred).exists(): return preferred @@ -71,13 +70,16 @@ def find_vaapi_device(preferred: str | None = None) -> str | None: if not renders: return None - # Prefer PCI Display controller (0x038000) over VGA (0x030000) — iGPU on - # AMD Framework / Strix hybrids. Fall back to first non-USB node. + # Lower score wins: Intel (T480) / AMD display-class, then other, then dGPU/NVIDIA. scored: list[tuple[int, str]] = [] for node in renders: - cls = _pci_class_for_render(node) or "" - if cls.startswith("0x038"): + cls, vendor = _pci_attrs_for_render(node) + if vendor == "0x8086": + score = 0 + elif cls.startswith("0x038"): score = 0 + elif vendor == "0x10de": + score = 3 elif cls.startswith("0x030"): score = 2 else: -- cgit v1.2.3