rgb is default (#35467)

* rgb is default

* change dummy default
pull/35143/merge
Harald Schäfer 6 days ago committed by GitHub
parent 0d7b157965
commit a8639d3feb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 2
      selfdrive/test/process_replay/regen.py
  2. 8
      tools/lib/framereader.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":

@ -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)

Loading…
Cancel
Save