8000 Mobcam: Bildgröße anzeigen, Info-Text by IRL4YOU · Pull Request #3 · IRL4YOU/IRL4YOU-BOX · GitHub
[go: up one dir, main page]

Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions irl4you/hdmi_daemon.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
APPLE_VENDOR = "05ac"
MOBCAM_HELPER = os.path.join(os.path.dirname(os.path.abspath(__file__)), "mobcam_rtmp.py")
MOBCAM_WAIT = "Warte auf Moblin"
MOBCAM_FORMAT_RE = re.compile(r"^Bild: (\d+)x(\d+) (HEVC|H\.264)$") # Zeile des Hilfsprogramms, sobald Moblin Bild liefert
MOBCAM_TOO_HIGH = "Die Bitrate der Mobcam ist zu hoch. Bitte in Moblin höchstens 10 Mbit/s einstellen."
MOBCAM_PHONE_TEXT = "Kein iPhone angeschlossen (USB-Datenkabel, iPhone entsperren, „Vertrauen“ tippen)"
DJI_VENDOR = "2ca3"
Expand Down Expand Up @@ -450,6 +451,7 @@ def __init__(self, state_dir, rtmp_port=RTMP_PORT, rtmp_app=RTMP_APP, stat_url=S
self.dji_seen = {}
self._probe_run = probe or self._probe_process
self.usb = {"present": False, "name": "", "node": "", "format": "", "audio": "", "power": False}
self.mobcam_fmt = ""
self.usb_choice = None
self.usb_bad = set()
self.usb_cur = None
Expand Down Expand Up @@ -599,7 +601,8 @@ async def read_signal(self):
phone = find_apple_phone(self.sysusb)
if phone:
sig.update(plugged=True, locked=True, device="mobcam")
self.usb = dict(self.usb, power=False, present=bool(phone), name=phone["name"] if phone else "", node="", format="", audio="mobcam")
self.usb = dict(self.usb, power=False, present=bool(phone), name=phone["name"] if phone else "", node="",
format=self.mobcam_fmt if phone and self.proc is not None else "", audio="mobcam")
10BC8 return sig
loop = asyncio.get_event_loop()
try:
Expand All @@ -621,7 +624,12 @@ async def _drain(self, proc):
line = await proc.stderr.readline()
if not line:
break
self.tail.append(line.decode("utf-8", "replace").strip())
text = line.decode("utf-8", "replace").strip()
self.tail.append(text)
m = MOBCAM_FORMAT_RE.match(text)
if m:
self.mobcam_fmt = "%s×%s %s" % (m.group(1), m.group(2), "HEVC" if m.group(3) == "HEVC" else "H.264")
log.info("Mobcam: Bild %s", self.mobcam_fmt)
except Exception:
pass

Expand Down Expand Up @@ -659,6 +667,7 @@ async def _start(self, sig):
argv = feeder_argv(self.cfg, self.rtmp_port, self.rtmp_app, self.device, self.audio_device,
find_extra_audio(self.cfg.get("audio"), self.asound))
self.tail.clear()
self.mobcam_fmt = ""
try:
self.proc = await self._spawn(argv)
except Exception as e:
Expand All @@ -671,8 +680,11 @@ async def _start(self, sig):
self.state, self.message = "starting", ""
if getattr(self.proc, "stderr", None) is not None:
self._reader = asyncio.ensure_future(self._drain(self.proc))
log.info("Einspeisung gestartet (%s, %dx%d@%s, %d kbit/s, Schlüssel %s)", self.cfg.get("source", "hdmi"), sig.get("width") or 0, sig.get("height") or 0,
sig.get("fps") or "?", self.cfg["bitrate"], self.cfg["key"])
if self.cfg.get("source") == "mobcam":
log.info("Einspeisung gestartet (mobcam: Bild und Ton unverändert, Schlüssel %s)", self.cfg["key"])
else:
log.info("Einspeisung gestartet (%s, %dx%d@%s, %d kbit/s, Schlüssel %s)", self.cfg.get("source", "hdmi"), sig.get("width") or 0, sig.get("height") or 0,
sig.get("fps") or "?", self.cfg["bitrate"], self.cfg["key"])

async def _stop(self):
proc, self.proc = self.proc, None
Expand Down
2 changes: 1 addition & 1 deletion irl4you/web/i18n/en.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion irl4you/web/i18n/es.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion irl4you/web/i18n/fr.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion