nicoboy/wireclaw-pizero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: supprime textoverlay (rc=255 incompatibilité pixel) + queue avant udpsink

Browse Source 
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
nicoboy
2026-06-09 17:13:26 +02:00
parent 6b696f25d1
commit eb88f43ae1
1 changed files with 3 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
camera_server.py
View File

@ -82,19 +82,12 @@ def _h264_level(w: int, h: int) -> str:
# --- Pipeline builder -------------------------------------------------------- # --- Pipeline builder --------------------------------------------------------
def _build_pipeline(cfg: dict, encoder: str, overlay_text: str) -> str: def _build_pipeline(cfg: dict, encoder: str) -> str:
w, h, fps = cfg["width"], cfg["height"], cfg["fps"] w, h, fps = cfg["width"], cfg["height"], cfg["fps"]
host, port = cfg["jetson_host"], cfg["jetson_port"] host, port = cfg["jetson_host"], cfg["jetson_port"]
level = _h264_level(w, h) level = _h264_level(w, h)
sink = f"rtph264pay config-interval=1 pt=96 ! udpsink host={host} port={port}" sink = f"rtph264pay config-interval=1 pt=96 ! queue ! udpsink host={host} port={port}"
# shlex-safe: repr() wraps in single quotes, preserving spaces inside text value
overlay = (
f"textoverlay text={overlay_text!r} "
f"valignment=top halignment=left "
f'font-desc="Sans Bold 24" draw-shadow=true'
)
if encoder == "hw": if encoder == "hw":
bitrate_bps = cfg["bitrate_kbps"] * 1000 bitrate_bps = cfg["bitrate_kbps"] * 1000
@ -102,23 +95,16 @@ def _build_pipeline(cfg: dict, encoder: str, overlay_text: str) -> str:
f"libcamerasrc ! " f"libcamerasrc ! "
f"video/x-raw,width={w},height={h},format=NV12,framerate={fps}/1 ! " f"video/x-raw,width={w},height={h},format=NV12,framerate={fps}/1 ! "
f"v4l2convert ! " f"v4l2convert ! "
f"videoconvert ! "
f"{overlay} ! "
f"videoconvert ! "
f"v4l2convert ! video/x-raw,format=I420 ! "
f"v4l2h264enc video-bitrate={bitrate_bps} " f"v4l2h264enc video-bitrate={bitrate_bps} "
f'extra-controls="controls,repeat_sequence_header=1" ! ' f'extra-controls="controls,repeat_sequence_header=1" ! '
f"video/x-h264,level=(string){level} ! " f"video/x-h264,level=(string){level} ! "
f"h264parse ! " f"h264parse ! "
f"{sink}" f"{sink}"
) )
# sw — videoconvert handles any format before and after textoverlay
return ( return (
f"libcamerasrc ! " f"libcamerasrc ! "
f"video/x-raw,width={w},height={h},framerate={fps}/1 ! " f"video/x-raw,width={w},height={h},framerate={fps}/1 ! "
f"videoconvert ! " f"videoconvert ! "
f"{overlay} ! "
f"videoconvert ! "
f"x264enc tune=zerolatency bitrate={cfg['bitrate_kbps']} ! " f"x264enc tune=zerolatency bitrate={cfg['bitrate_kbps']} ! "
f"{sink}" f"{sink}"
) )
@ -201,11 +187,7 @@ class GstManager:
with self._lock: with self._lock:
cfg = dict(self._cfg) cfg = dict(self._cfg)
temp = _get_temp_celsius() pipeline = _build_pipeline(cfg, encoder)
temp_str = f"{temp:.1f}C" if temp is not None else "?C"
overlay_text = f"temp={temp_str} {cfg['fps']}fps {cfg['width']}x{cfg['height']}"
pipeline = _build_pipeline(cfg, encoder, overlay_text)
cmd = ["gst-launch-1.0", "-e"] + shlex.split(pipeline) cmd = ["gst-launch-1.0", "-e"] + shlex.split(pipeline)
log.info("GStreamer [%s] pipeline: %s", encoder, pipeline) log.info("GStreamer [%s] pipeline: %s", encoder, pipeline)
try: try: