From a8639d3feb79f77278f87f4517778b38eeea3fee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Harald=20Sch=C3=A4fer?= Date: Wed, 4 Jun 2025 23:40:41 -0700 Subject: [PATCH] rgb is default (#35467) * rgb is default * change dummy default --- selfdrive/test/process_replay/regen.py | 2 +- tools/lib/framereader.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/selfdrive/test/process_replay/regen.py b/selfdrive/test/process_replay/regen.py index 4d00613f0a..273659c9ff 100755 --- a/selfdrive/test/process_replay/regen.py +++ b/selfdrive/test/process_replay/regen.py @@ -23,7 +23,7 @@ class DummyFrameReader(BaseFrameReader): self.frame_count = frame_count self.frame_type = FrameType.raw - def get(self, idx, count=1, pix_fmt="yuv420p"): + def get(self, idx, count=1, pix_fmt="rgb24"): if pix_fmt == "rgb24": shape = (self.h, self.w, 3) elif pix_fmt == "nv12" or pix_fmt == "yuv420p": diff --git a/tools/lib/framereader.py b/tools/lib/framereader.py index 275b9b65b8..0eddc88868 100644 --- a/tools/lib/framereader.py +++ b/tools/lib/framereader.py @@ -209,7 +209,7 @@ class BaseFrameReader: def close(self): pass - def get(self, num, count=1, pix_fmt="yuv420p"): + def get(self, num, count=1, pix_fmt="rgb24"): raise NotImplementedError @@ -497,7 +497,7 @@ class GOPFrameReader(BaseFrameReader): return self.frame_cache[(num, pix_fmt)] - def get(self, num, count=1, pix_fmt="yuv420p"): + def get(self, num, count=1, pix_fmt="rgb24"): assert self.frame_count is not None if num + count > self.frame_count: @@ -523,12 +523,12 @@ class StreamFrameReader(StreamGOPReader, GOPFrameReader): GOPFrameReader.__init__(self, readahead, readbehind) -def GOPFrameIterator(gop_reader, pix_fmt): +def GOPFrameIterator(gop_reader, pix_fmt='rgb24'): dec = VideoStreamDecompressor(gop_reader.fn, gop_reader.vid_fmt, gop_reader.w, gop_reader.h, pix_fmt) yield from dec.read() -def FrameIterator(fn, pix_fmt, **kwargs): +def FrameIterator(fn, pix_fmt='rgb24', **kwargs): fr = FrameReader(fn, **kwargs) if isinstance(fr, GOPReader): yield from GOPFrameIterator(fr, pix_fmt)