py: cam: Convert ctx and state to classes
Convert ctx and state dicts to classes. No functional changes. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Tomi Valkeinen
Laurent Pinchart
parent
bb1cbd53d2
commit
6eb1143e27
5 changed files with 380 additions and 398 deletions
|
|
@ -6,6 +6,7 @@
|
|||
# \todo Convert ctx and state dicts to proper classes, and move relevant
|
||||
# functions to those classes.
|
||||
|
||||
from typing import Any
|
||||
import argparse
|
||||
import binascii
|
||||
import libcamera as libcam
|
||||
|
|
@ -14,6 +15,341 @@ import sys
|
|||
import traceback
|
||||
|
||||
|
||||
class CameraContext:
|
||||
camera: libcam.Camera
|
||||
id: str
|
||||
idx: int
|
||||
|
||||
opt_stream: str
|
||||
opt_strict_formats: bool
|
||||
opt_crc: bool
|
||||
opt_metadata: bool
|
||||
opt_save_frames: bool
|
||||
opt_capture: int
|
||||
|
||||
stream_names: dict[libcam.Stream, str]
|
||||
streams: list[libcam.Stream]
|
||||
allocator: libcam.FrameBufferAllocator
|
||||
requests: list[libcam.Request]
|
||||
reqs_queued: int
|
||||
reqs_completed: int
|
||||
last: int = 0
|
||||
fps: float
|
||||
|
||||
def __init__(self, camera, idx):
|
||||
self.camera = camera
|
||||
self.idx = idx
|
||||
self.id = 'cam' + str(idx)
|
||||
self.reqs_queued = 0
|
||||
self.reqs_completed = 0
|
||||
|
||||
def do_cmd_list_props(self):
|
||||
print('Properties for', self.id)
|
||||
|
||||
for name, prop in self.camera.properties.items():
|
||||
print('\t{}: {}'.format(name, prop))
|
||||
|
||||
def do_cmd_list_controls(self):
|
||||
print('Controls for', self.id)
|
||||
|
||||
for name, prop in self.camera.controls.items():
|
||||
print('\t{}: {}'.format(name, prop))
|
||||
|
||||
def do_cmd_info(self):
|
||||
print('Stream info for', self.id)
|
||||
|
||||
roles = [libcam.StreamRole.Viewfinder]
|
||||
|
||||
camconfig = self.camera.generate_configuration(roles)
|
||||
if camconfig is None:
|
||||
raise Exception('Generating config failed')
|
||||
|
||||
for i, stream_config in enumerate(camconfig):
|
||||
print('\t{}: {}'.format(i, stream_config))
|
||||
|
||||
formats = stream_config.formats
|
||||
for fmt in formats.pixel_formats:
|
||||
print('\t * Pixelformat:', fmt, formats.range(fmt))
|
||||
|
||||
for size in formats.sizes(fmt):
|
||||
print('\t -', size)
|
||||
|
||||
def acquire(self):
|
||||
self.camera.acquire()
|
||||
|
||||
def release(self):
|
||||
self.camera.release()
|
||||
|
||||
def __parse_streams(self):
|
||||
streams = []
|
||||
|
||||
for stream_desc in self.opt_stream:
|
||||
stream_opts: dict[str, Any]
|
||||
stream_opts = {'role': libcam.StreamRole.Viewfinder}
|
||||
|
||||
for stream_opt in stream_desc.split(','):
|
||||
if stream_opt == 0:
|
||||
continue
|
||||
|
||||
arr = stream_opt.split('=')
|
||||
if len(arr) != 2:
|
||||
print('Bad stream option', stream_opt)
|
||||
sys.exit(-1)
|
||||
|
||||
key = arr[0]
|
||||
value = arr[1]
|
||||
|
||||
if key in ['width', 'height']:
|
||||
value = int(value)
|
||||
elif key == 'role':
|
||||
rolemap = {
|
||||
'still': libcam.StreamRole.StillCapture,
|
||||
'raw': libcam.StreamRole.Raw,
|
||||
'video': libcam.StreamRole.VideoRecording,
|
||||
'viewfinder': libcam.StreamRole.Viewfinder,
|
||||
}
|
||||
|
||||
role = rolemap.get(value.lower(), None)
|
||||
|
||||
if role is None:
|
||||
print('Bad stream role', value)
|
||||
sys.exit(-1)
|
||||
|
||||
value = role
|
||||
elif key == 'pixelformat':
|
||||
pass
|
||||
else:
|
||||
print('Bad stream option key', key)
|
||||
sys.exit(-1)
|
||||
|
||||
stream_opts[key] = value
|
||||
|
||||
streams.append(stream_opts)
|
||||
|
||||
return streams
|
||||
|
||||
def configure(self):
|
||||
streams = self.__parse_streams()
|
||||
|
||||
roles = [opts['role'] for opts in streams]
|
||||
|
||||
camconfig = self.camera.generate_configuration(roles)
|
||||
if camconfig is None:
|
||||
raise Exception('Generating config failed')
|
||||
|
||||
for idx, stream_opts in enumerate(streams):
|
||||
stream_config = camconfig.at(idx)
|
||||
|
||||
if 'width' in stream_opts:
|
||||
stream_config.size.width = stream_opts['width']
|
||||
|
||||
if 'height' in stream_opts:
|
||||
stream_config.size.height = stream_opts['height']
|
||||
|
||||
if 'pixelformat' in stream_opts:
|
||||
stream_config.pixel_format = libcam.PixelFormat(stream_opts['pixelformat'])
|
||||
|
||||
stat = camconfig.validate()
|
||||
|
||||
if stat == libcam.CameraConfiguration.Status.Invalid:
|
||||
print('Camera configuration invalid')
|
||||
exit(-1)
|
||||
elif stat == libcam.CameraConfiguration.Status.Adjusted:
|
||||
if self.opt_strict_formats:
|
||||
print('Adjusting camera configuration disallowed by --strict-formats argument')
|
||||
exit(-1)
|
||||
|
||||
print('Camera configuration adjusted')
|
||||
|
||||
r = self.camera.configure(camconfig)
|
||||
if r != 0:
|
||||
raise Exception('Configure failed')
|
||||
|
||||
self.stream_names = {}
|
||||
self.streams = []
|
||||
|
||||
for idx, stream_config in enumerate(camconfig):
|
||||
stream = stream_config.stream
|
||||
self.streams.append(stream)
|
||||
self.stream_names[stream] = 'stream' + str(idx)
|
||||
print('{}-{}: stream config {}'.format(self.id, self.stream_names[stream], stream.configuration))
|
||||
|
||||
def alloc_buffers(self):
|
||||
allocator = libcam.FrameBufferAllocator(self.camera)
|
||||
|
||||
for stream in self.streams:
|
||||
ret = allocator.allocate(stream)
|
||||
if ret < 0:
|
||||
print('Cannot allocate buffers')
|
||||
exit(-1)
|
||||
|
||||
allocated = len(allocator.buffers(stream))
|
||||
|
||||
print('{}-{}: Allocated {} buffers'.format(self.id, self.stream_names[stream], allocated))
|
||||
|
||||
self.allocator = allocator
|
||||
|
||||
def create_requests(self):
|
||||
self.requests = []
|
||||
|
||||
# Identify the stream with the least number of buffers
|
||||
num_bufs = min([len(self.allocator.buffers(stream)) for stream in self.streams])
|
||||
|
||||
requests = []
|
||||
|
||||
for buf_num in range(num_bufs):
|
||||
request = self.camera.create_request(self.idx)
|
||||
|
||||
if request is None:
|
||||
print('Can not create request')
|
||||
exit(-1)
|
||||
|
||||
for stream in self.streams:
|
||||
buffers = self.allocator.buffers(stream)
|
||||
buffer = buffers[buf_num]
|
||||
|
||||
ret = request.add_buffer(stream, buffer)
|
||||
if ret < 0:
|
||||
print('Can not set buffer for request')
|
||||
exit(-1)
|
||||
|
||||
requests.append(request)
|
||||
|
||||
self.requests = requests
|
||||
|
||||
def start(self):
|
||||
self.camera.start()
|
||||
|
||||
def stop(self):
|
||||
self.camera.stop()
|
||||
|
||||
def queue_requests(self):
|
||||
for request in self.requests:
|
||||
self.camera.queue_request(request)
|
||||
self.reqs_queued += 1
|
||||
|
||||
del self.requests
|
||||
|
||||
|
||||
class CaptureState:
|
||||
cm: libcam.CameraManager
|
||||
contexts: list[CameraContext]
|
||||
renderer: Any
|
||||
|
||||
def __init__(self, cm, contexts):
|
||||
self.cm = cm
|
||||
self.contexts = contexts
|
||||
|
||||
# Called from renderer when there is a libcamera event
|
||||
def event_handler(self):
|
||||
try:
|
||||
self.cm.read_event()
|
||||
|
||||
reqs = self.cm.get_ready_requests()
|
||||
|
||||
for req in reqs:
|
||||
ctx = next(ctx for ctx in self.contexts if ctx.idx == req.cookie)
|
||||
self.__request_handler(ctx, req)
|
||||
|
||||
running = any(ctx.reqs_completed < ctx.opt_capture for ctx in self.contexts)
|
||||
return running
|
||||
except Exception:
|
||||
traceback.print_exc()
|
||||
return False
|
||||
|
||||
def __request_handler(self, ctx, req):
|
||||
if req.status != libcam.Request.Status.Complete:
|
||||
raise Exception('{}: Request failed: {}'.format(ctx.id, req.status))
|
||||
|
||||
buffers = req.buffers
|
||||
|
||||
# Compute the frame rate. The timestamp is arbitrarily retrieved from
|
||||
# the first buffer, as all buffers should have matching timestamps.
|
||||
ts = buffers[next(iter(buffers))].metadata.timestamp
|
||||
last = ctx.last
|
||||
fps = 1000000000.0 / (ts - last) if (last != 0 and (ts - last) != 0) else 0
|
||||
ctx.last = ts
|
||||
ctx.fps = fps
|
||||
|
||||
for stream, fb in buffers.items():
|
||||
stream_name = ctx.stream_names[stream]
|
||||
|
||||
crcs = []
|
||||
if ctx.opt_crc:
|
||||
with libcamera.utils.MappedFrameBuffer(fb) as mfb:
|
||||
plane_crcs = [binascii.crc32(p) for p in mfb.planes]
|
||||
crcs.append(plane_crcs)
|
||||
|
||||
meta = fb.metadata
|
||||
|
||||
print('{:.6f} ({:.2f} fps) {}-{}: seq {}, bytes {}, CRCs {}'
|
||||
.format(ts / 1000000000, fps,
|
||||
ctx.id, stream_name,
|
||||
meta.sequence, meta.bytesused,
|
||||
crcs))
|
||||
|
||||
if ctx.opt_metadata:
|
||||
reqmeta = req.metadata
|
||||
for ctrl, val in reqmeta.items():
|
||||
print(f'\t{ctrl} = {val}')
|
||||
|
||||
if ctx.opt_save_frames:
|
||||
with libcamera.utils.MappedFrameBuffer(fb) as mfb:
|
||||
filename = 'frame-{}-{}-{}.data'.format(ctx.id, stream_name, ctx.reqs_completed)
|
||||
with open(filename, 'wb') as f:
|
||||
for p in mfb.planes:
|
||||
f.write(p)
|
||||
|
||||
self.renderer.request_handler(ctx, req)
|
||||
|
||||
ctx.reqs_completed += 1
|
||||
|
||||
# Called from renderer when it has finished with a request
|
||||
def request_processed(self, ctx, req):
|
||||
if ctx.reqs_queued < ctx.opt_capture:
|
||||
req.reuse()
|
||||
ctx.camera.queue_request(req)
|
||||
ctx.reqs_queued += 1
|
||||
|
||||
def __capture_init(self):
|
||||
for ctx in self.contexts:
|
||||
ctx.acquire()
|
||||
|
||||
for ctx in self.contexts:
|
||||
ctx.configure()
|
||||
|
||||
for ctx in self.contexts:
|
||||
ctx.alloc_buffers()
|
||||
|
||||
for ctx in self.contexts:
|
||||
ctx.create_requests()
|
||||
|
||||
def __capture_start(self):
|
||||
for ctx in self.contexts:
|
||||
ctx.start()
|
||||
|
||||
for ctx in self.contexts:
|
||||
ctx.queue_requests()
|
||||
|
||||
def __capture_deinit(self):
|
||||
for ctx in self.contexts:
|
||||
ctx.stop()
|
||||
|
||||
for ctx in self.contexts:
|
||||
ctx.release()
|
||||
|
||||
def do_cmd_capture(self):
|
||||
self.__capture_init()
|
||||
|
||||
self.renderer.setup()
|
||||
|
||||
self.__capture_start()
|
||||
|
||||
self.renderer.run()
|
||||
|
||||
self.__capture_deinit()
|
||||
|
||||
|
||||
class CustomAction(argparse.Action):
|
||||
def __init__(self, option_strings, dest, **kwargs):
|
||||
super().__init__(option_strings, dest, default={}, **kwargs)
|
||||
|
|
@ -46,349 +382,6 @@ def do_cmd_list(cm):
|
|||
print(f'{idx + 1}: {c.id}')
|
||||
|
||||
|
||||
def do_cmd_list_props(ctx):
|
||||
camera = ctx['camera']
|
||||
|
||||
print('Properties for', ctx['id'])
|
||||
|
||||
for name, prop in camera.properties.items():
|
||||
print('\t{}: {}'.format(name, prop))
|
||||
|
||||
|
||||
def do_cmd_list_controls(ctx):
|
||||
camera = ctx['camera']
|
||||
|
||||
print('Controls for', ctx['id'])
|
||||
|
||||
for name, prop in camera.controls.items():
|
||||
print('\t{}: {}'.format(name, prop))
|
||||
|
||||
|
||||
def do_cmd_info(ctx):
|
||||
camera = ctx['camera']
|
||||
|
||||
print('Stream info for', ctx['id'])
|
||||
|
||||
roles = [libcam.StreamRole.Viewfinder]
|
||||
|
||||
camconfig = camera.generate_configuration(roles)
|
||||
if camconfig is None:
|
||||
raise Exception('Generating config failed')
|
||||
|
||||
for i, stream_config in enumerate(camconfig):
|
||||
print('\t{}: {}'.format(i, stream_config))
|
||||
|
||||
formats = stream_config.formats
|
||||
for fmt in formats.pixel_formats:
|
||||
print('\t * Pixelformat:', fmt, formats.range(fmt))
|
||||
|
||||
for size in formats.sizes(fmt):
|
||||
print('\t -', size)
|
||||
|
||||
|
||||
def acquire(ctx):
|
||||
camera = ctx['camera']
|
||||
|
||||
camera.acquire()
|
||||
|
||||
|
||||
def release(ctx):
|
||||
camera = ctx['camera']
|
||||
|
||||
camera.release()
|
||||
|
||||
|
||||
def parse_streams(ctx):
|
||||
streams = []
|
||||
|
||||
for stream_desc in ctx['opt-stream']:
|
||||
stream_opts = {'role': libcam.StreamRole.Viewfinder}
|
||||
|
||||
for stream_opt in stream_desc.split(','):
|
||||
if stream_opt == 0:
|
||||
continue
|
||||
|
||||
arr = stream_opt.split('=')
|
||||
if len(arr) != 2:
|
||||
print('Bad stream option', stream_opt)
|
||||
sys.exit(-1)
|
||||
|
||||
key = arr[0]
|
||||
value = arr[1]
|
||||
|
||||
if key in ['width', 'height']:
|
||||
value = int(value)
|
||||
elif key == 'role':
|
||||
rolemap = {
|
||||
'still': libcam.StreamRole.StillCapture,
|
||||
'raw': libcam.StreamRole.Raw,
|
||||
'video': libcam.StreamRole.VideoRecording,
|
||||
'viewfinder': libcam.StreamRole.Viewfinder,
|
||||
}
|
||||
|
||||
role = rolemap.get(value.lower(), None)
|
||||
|
||||
if role is None:
|
||||
print('Bad stream role', value)
|
||||
sys.exit(-1)
|
||||
|
||||
value = role
|
||||
elif key == 'pixelformat':
|
||||
pass
|
||||
else:
|
||||
print('Bad stream option key', key)
|
||||
sys.exit(-1)
|
||||
|
||||
stream_opts[key] = value
|
||||
|
||||
streams.append(stream_opts)
|
||||
|
||||
return streams
|
||||
|
||||
|
||||
def configure(ctx):
|
||||
camera = ctx['camera']
|
||||
|
||||
streams = parse_streams(ctx)
|
||||
|
||||
roles = [opts['role'] for opts in streams]
|
||||
|
||||
camconfig = camera.generate_configuration(roles)
|
||||
if camconfig is None:
|
||||
raise Exception('Generating config failed')
|
||||
|
||||
for idx, stream_opts in enumerate(streams):
|
||||
stream_config = camconfig.at(idx)
|
||||
|
||||
if 'width' in stream_opts:
|
||||
stream_config.size.width = stream_opts['width']
|
||||
|
||||
if 'height' in stream_opts:
|
||||
stream_config.size.height = stream_opts['height']
|
||||
|
||||
if 'pixelformat' in stream_opts:
|
||||
stream_config.pixel_format = libcam.PixelFormat(stream_opts['pixelformat'])
|
||||
|
||||
stat = camconfig.validate()
|
||||
|
||||
if stat == libcam.CameraConfiguration.Status.Invalid:
|
||||
print('Camera configuration invalid')
|
||||
exit(-1)
|
||||
elif stat == libcam.CameraConfiguration.Status.Adjusted:
|
||||
if ctx['opt-strict-formats']:
|
||||
print('Adjusting camera configuration disallowed by --strict-formats argument')
|
||||
exit(-1)
|
||||
|
||||
print('Camera configuration adjusted')
|
||||
|
||||
r = camera.configure(camconfig)
|
||||
if r != 0:
|
||||
raise Exception('Configure failed')
|
||||
|
||||
ctx['stream-names'] = {}
|
||||
ctx['streams'] = []
|
||||
|
||||
for idx, stream_config in enumerate(camconfig):
|
||||
stream = stream_config.stream
|
||||
ctx['streams'].append(stream)
|
||||
ctx['stream-names'][stream] = 'stream' + str(idx)
|
||||
print('{}-{}: stream config {}'.format(ctx['id'], ctx['stream-names'][stream], stream.configuration))
|
||||
|
||||
|
||||
def alloc_buffers(ctx):
|
||||
camera = ctx['camera']
|
||||
|
||||
allocator = libcam.FrameBufferAllocator(camera)
|
||||
|
||||
for idx, stream in enumerate(ctx['streams']):
|
||||
ret = allocator.allocate(stream)
|
||||
if ret < 0:
|
||||
print('Cannot allocate buffers')
|
||||
exit(-1)
|
||||
|
||||
allocated = len(allocator.buffers(stream))
|
||||
|
||||
print('{}-{}: Allocated {} buffers'.format(ctx['id'], ctx['stream-names'][stream], allocated))
|
||||
|
||||
ctx['allocator'] = allocator
|
||||
|
||||
|
||||
def create_requests(ctx):
|
||||
camera = ctx['camera']
|
||||
|
||||
ctx['requests'] = []
|
||||
|
||||
# Identify the stream with the least number of buffers
|
||||
num_bufs = min([len(ctx['allocator'].buffers(stream)) for stream in ctx['streams']])
|
||||
|
||||
requests = []
|
||||
|
||||
for buf_num in range(num_bufs):
|
||||
request = camera.create_request(ctx['idx'])
|
||||
|
||||
if request is None:
|
||||
print('Can not create request')
|
||||
exit(-1)
|
||||
|
||||
for stream in ctx['streams']:
|
||||
buffers = ctx['allocator'].buffers(stream)
|
||||
buffer = buffers[buf_num]
|
||||
|
||||
ret = request.add_buffer(stream, buffer)
|
||||
if ret < 0:
|
||||
print('Can not set buffer for request')
|
||||
exit(-1)
|
||||
|
||||
requests.append(request)
|
||||
|
||||
ctx['requests'] = requests
|
||||
|
||||
|
||||
def start(ctx):
|
||||
camera = ctx['camera']
|
||||
|
||||
camera.start()
|
||||
|
||||
|
||||
def stop(ctx):
|
||||
camera = ctx['camera']
|
||||
|
||||
camera.stop()
|
||||
|
||||
|
||||
def queue_requests(ctx):
|
||||
camera = ctx['camera']
|
||||
|
||||
for request in ctx['requests']:
|
||||
camera.queue_request(request)
|
||||
ctx['reqs-queued'] += 1
|
||||
|
||||
del ctx['requests']
|
||||
|
||||
|
||||
def capture_init(contexts):
|
||||
for ctx in contexts:
|
||||
acquire(ctx)
|
||||
|
||||
for ctx in contexts:
|
||||
configure(ctx)
|
||||
|
||||
for ctx in contexts:
|
||||
alloc_buffers(ctx)
|
||||
|
||||
for ctx in contexts:
|
||||
create_requests(ctx)
|
||||
|
||||
|
||||
def capture_start(contexts):
|
||||
for ctx in contexts:
|
||||
start(ctx)
|
||||
|
||||
for ctx in contexts:
|
||||
queue_requests(ctx)
|
||||
|
||||
|
||||
# Called from renderer when there is a libcamera event
|
||||
def event_handler(state):
|
||||
try:
|
||||
cm = state['cm']
|
||||
contexts = state['contexts']
|
||||
|
||||
cm.read_event()
|
||||
|
||||
reqs = cm.get_ready_requests()
|
||||
|
||||
for req in reqs:
|
||||
ctx = next(ctx for ctx in contexts if ctx['idx'] == req.cookie)
|
||||
request_handler(state, ctx, req)
|
||||
|
||||
running = any(ctx['reqs-completed'] < ctx['opt-capture'] for ctx in contexts)
|
||||
return running
|
||||
except Exception:
|
||||
traceback.print_exc()
|
||||
return False
|
||||
|
||||
|
||||
def request_handler(state, ctx, req):
|
||||
if req.status != libcam.Request.Status.Complete:
|
||||
raise Exception('{}: Request failed: {}'.format(ctx['id'], req.status))
|
||||
|
||||
buffers = req.buffers
|
||||
|
||||
# Compute the frame rate. The timestamp is arbitrarily retrieved from
|
||||
# the first buffer, as all buffers should have matching timestamps.
|
||||
ts = buffers[next(iter(buffers))].metadata.timestamp
|
||||
last = ctx.get('last', 0)
|
||||
fps = 1000000000.0 / (ts - last) if (last != 0 and (ts - last) != 0) else 0
|
||||
ctx['last'] = ts
|
||||
ctx['fps'] = fps
|
||||
|
||||
for stream, fb in buffers.items():
|
||||
stream_name = ctx['stream-names'][stream]
|
||||
|
||||
crcs = []
|
||||
if ctx['opt-crc']:
|
||||
with libcamera.utils.MappedFrameBuffer(fb) as mfb:
|
||||
plane_crcs = [binascii.crc32(p) for p in mfb.planes]
|
||||
crcs.append(plane_crcs)
|
||||
|
||||
meta = fb.metadata
|
||||
|
||||
print('{:.6f} ({:.2f} fps) {}-{}: seq {}, bytes {}, CRCs {}'
|
||||
.format(ts / 1000000000, fps,
|
||||
ctx['id'], stream_name,
|
||||
meta.sequence, meta.bytesused,
|
||||
crcs))
|
||||
|
||||
if ctx['opt-metadata']:
|
||||
reqmeta = req.metadata
|
||||
for ctrl, val in reqmeta.items():
|
||||
print(f'\t{ctrl} = {val}')
|
||||
|
||||
if ctx['opt-save-frames']:
|
||||
with libcamera.utils.MappedFrameBuffer(fb) as mfb:
|
||||
filename = 'frame-{}-{}-{}.data'.format(ctx['id'], stream_name, ctx['reqs-completed'])
|
||||
with open(filename, 'wb') as f:
|
||||
for p in mfb.planes:
|
||||
f.write(p)
|
||||
|
||||
state['renderer'].request_handler(ctx, req)
|
||||
|
||||
ctx['reqs-completed'] += 1
|
||||
|
||||
|
||||
# Called from renderer when it has finished with a request
|
||||
def request_prcessed(ctx, req):
|
||||
camera = ctx['camera']
|
||||
|
||||
if ctx['reqs-queued'] < ctx['opt-capture']:
|
||||
req.reuse()
|
||||
camera.queue_request(req)
|
||||
ctx['reqs-queued'] += 1
|
||||
|
||||
|
||||
def capture_deinit(contexts):
|
||||
for ctx in contexts:
|
||||
stop(ctx)
|
||||
|
||||
for ctx in contexts:
|
||||
release(ctx)
|
||||
|
||||
|
||||
def do_cmd_capture(state):
|
||||
capture_init(state['contexts'])
|
||||
|
||||
renderer = state['renderer']
|
||||
|
||||
renderer.setup()
|
||||
|
||||
capture_start(state['contexts'])
|
||||
|
||||
renderer.run()
|
||||
|
||||
capture_deinit(state['contexts'])
|
||||
|
||||
|
||||
def main():
|
||||
parser = argparse.ArgumentParser()
|
||||
# global options
|
||||
|
|
@ -422,39 +415,28 @@ def main():
|
|||
print('Unable to find camera', cam_idx)
|
||||
return -1
|
||||
|
||||
contexts.append({
|
||||
'camera': camera,
|
||||
'idx': cam_idx,
|
||||
'id': 'cam' + str(cam_idx),
|
||||
'reqs-queued': 0,
|
||||
'reqs-completed': 0,
|
||||
'opt-capture': args.capture.get(cam_idx, False),
|
||||
'opt-crc': args.crc.get(cam_idx, False),
|
||||
'opt-save-frames': args.save_frames.get(cam_idx, False),
|
||||
'opt-metadata': args.metadata.get(cam_idx, False),
|
||||
'opt-strict-formats': args.strict_formats.get(cam_idx, False),
|
||||
'opt-stream': args.stream.get(cam_idx, ['role=viewfinder']),
|
||||
})
|
||||
ctx = CameraContext(camera, cam_idx)
|
||||
ctx.opt_capture = args.capture.get(cam_idx, 0)
|
||||
ctx.opt_crc = args.crc.get(cam_idx, False)
|
||||
ctx.opt_save_frames = args.save_frames.get(cam_idx, False)
|
||||
ctx.opt_metadata = args.metadata.get(cam_idx, False)
|
||||
ctx.opt_strict_formats = args.strict_formats.get(cam_idx, False)
|
||||
ctx.opt_stream = args.stream.get(cam_idx, ['role=viewfinder'])
|
||||
contexts.append(ctx)
|
||||
|
||||
for ctx in contexts:
|
||||
print('Using camera {} as {}'.format(ctx['camera'].id, ctx['id']))
|
||||
print('Using camera {} as {}'.format(ctx.camera.id, ctx.id))
|
||||
|
||||
for ctx in contexts:
|
||||
if args.list_properties:
|
||||
do_cmd_list_props(ctx)
|
||||
ctx.do_cmd_list_props()
|
||||
if args.list_controls:
|
||||
do_cmd_list_controls(ctx)
|
||||
ctx.do_cmd_list_controls()
|
||||
if args.info:
|
||||
do_cmd_info(ctx)
|
||||
ctx.do_cmd_info()
|
||||
|
||||
if args.capture:
|
||||
|
||||
state = {
|
||||
'cm': cm,
|
||||
'contexts': contexts,
|
||||
'event_handler': event_handler,
|
||||
'request_prcessed': request_prcessed,
|
||||
}
|
||||
state = CaptureState(cm, contexts)
|
||||
|
||||
if args.renderer == 'null':
|
||||
import cam_null
|
||||
|
|
@ -472,9 +454,9 @@ def main():
|
|||
print('Bad renderer', args.renderer)
|
||||
return -1
|
||||
|
||||
state['renderer'] = renderer
|
||||
state.renderer = renderer
|
||||
|
||||
do_cmd_capture(state)
|
||||
state.do_cmd_capture()
|
||||
|
||||
return 0
|
||||
|
||||
|
|
|
|||
|
|
@ -10,8 +10,8 @@ class KMSRenderer:
|
|||
def __init__(self, state):
|
||||
self.state = state
|
||||
|
||||
self.cm = state['cm']
|
||||
self.contexts = state['contexts']
|
||||
self.cm = state.cm
|
||||
self.contexts = state.contexts
|
||||
self.running = False
|
||||
|
||||
card = pykms.Card()
|
||||
|
|
@ -92,7 +92,7 @@ class KMSRenderer:
|
|||
if old:
|
||||
req = old['camreq']
|
||||
ctx = old['camctx']
|
||||
self.state['request_prcessed'](ctx, req)
|
||||
self.state.request_processed(ctx, req)
|
||||
|
||||
def queue(self, drmreq):
|
||||
if not self.next:
|
||||
|
|
@ -108,7 +108,7 @@ class KMSRenderer:
|
|||
|
||||
idx = 0
|
||||
for ctx in self.contexts:
|
||||
for stream in ctx['streams']:
|
||||
for stream in ctx.streams:
|
||||
|
||||
cfg = stream.configuration
|
||||
fmt = cfg.pixel_format
|
||||
|
|
@ -125,7 +125,7 @@ class KMSRenderer:
|
|||
'size': cfg.size,
|
||||
})
|
||||
|
||||
for fb in ctx['allocator'].buffers(stream):
|
||||
for fb in ctx.allocator.buffers(stream):
|
||||
w = cfg.size.width
|
||||
h = cfg.size.height
|
||||
fds = []
|
||||
|
|
@ -148,7 +148,7 @@ class KMSRenderer:
|
|||
self.handle_page_flip(ev.seq, ev.time)
|
||||
|
||||
def readcam(self, fd):
|
||||
self.running = self.state['event_handler'](self.state)
|
||||
self.running = self.state.event_handler()
|
||||
|
||||
def readkey(self, fileobj):
|
||||
sys.stdin.readline()
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@ class NullRenderer:
|
|||
def __init__(self, state):
|
||||
self.state = state
|
||||
|
||||
self.cm = state['cm']
|
||||
self.contexts = state['contexts']
|
||||
self.cm = state.cm
|
||||
self.contexts = state.contexts
|
||||
|
||||
self.running = False
|
||||
|
||||
|
|
@ -37,11 +37,11 @@ class NullRenderer:
|
|||
print('Exiting...')
|
||||
|
||||
def readcam(self, fd):
|
||||
self.running = self.state['event_handler'](self.state)
|
||||
self.running = self.state.event_handler()
|
||||
|
||||
def readkey(self, fileobj):
|
||||
sys.stdin.readline()
|
||||
self.running = False
|
||||
|
||||
def request_handler(self, ctx, req):
|
||||
self.state['request_prcessed'](ctx, req)
|
||||
self.state.request_processed(ctx, req)
|
||||
|
|
|
|||
|
|
@ -176,8 +176,8 @@ class QtRenderer:
|
|||
def __init__(self, state):
|
||||
self.state = state
|
||||
|
||||
self.cm = state['cm']
|
||||
self.contexts = state['contexts']
|
||||
self.cm = state.cm
|
||||
self.contexts = state.contexts
|
||||
|
||||
def setup(self):
|
||||
self.app = QtWidgets.QApplication([])
|
||||
|
|
@ -185,7 +185,7 @@ class QtRenderer:
|
|||
windows = []
|
||||
|
||||
for ctx in self.contexts:
|
||||
for stream in ctx['streams']:
|
||||
for stream in ctx.streams:
|
||||
window = MainWindow(ctx, stream)
|
||||
window.show()
|
||||
windows.append(window)
|
||||
|
|
@ -206,7 +206,7 @@ class QtRenderer:
|
|||
print('Exiting...')
|
||||
|
||||
def readcam(self):
|
||||
running = self.state['event_handler'](self.state)
|
||||
running = self.state.event_handler()
|
||||
|
||||
if not running:
|
||||
self.app.quit()
|
||||
|
|
@ -223,7 +223,7 @@ class QtRenderer:
|
|||
|
||||
wnd.handle_request(stream, fb)
|
||||
|
||||
self.state['request_prcessed'](ctx, req)
|
||||
self.state.request_processed(ctx, req)
|
||||
|
||||
def cleanup(self):
|
||||
for w in self.windows:
|
||||
|
|
@ -254,7 +254,7 @@ class MainWindow(QtWidgets.QWidget):
|
|||
group.setLayout(groupLayout)
|
||||
controlsLayout.addWidget(group)
|
||||
|
||||
lab = QtWidgets.QLabel(ctx['id'])
|
||||
lab = QtWidgets.QLabel(ctx.id)
|
||||
groupLayout.addWidget(lab)
|
||||
|
||||
self.frameLabel = QtWidgets.QLabel()
|
||||
|
|
@ -265,7 +265,7 @@ class MainWindow(QtWidgets.QWidget):
|
|||
group.setLayout(groupLayout)
|
||||
controlsLayout.addWidget(group)
|
||||
|
||||
camera = ctx['camera']
|
||||
camera = ctx.camera
|
||||
|
||||
for k, v in camera.properties.items():
|
||||
lab = QtWidgets.QLabel()
|
||||
|
|
@ -308,4 +308,4 @@ class MainWindow(QtWidgets.QWidget):
|
|||
self.label.setPixmap(pix)
|
||||
|
||||
self.frameLabel.setText('Queued: {}\nDone: {}\nFps: {:.2f}'
|
||||
.format(ctx['reqs-queued'], ctx['reqs-completed'], ctx['fps']))
|
||||
.format(ctx.reqs_queued, ctx.reqs_completed, ctx.fps))
|
||||
|
|
|
|||
|
|
@ -142,7 +142,7 @@ class QtRenderer:
|
|||
self.window = window
|
||||
|
||||
def run(self):
|
||||
camnotif = QtCore.QSocketNotifier(self.state['cm'].efd, QtCore.QSocketNotifier.Read)
|
||||
camnotif = QtCore.QSocketNotifier(self.state.cm.efd, QtCore.QSocketNotifier.Read)
|
||||
camnotif.activated.connect(lambda _: self.readcam())
|
||||
|
||||
keynotif = QtCore.QSocketNotifier(sys.stdin.fileno(), QtCore.QSocketNotifier.Read)
|
||||
|
|
@ -155,7 +155,7 @@ class QtRenderer:
|
|||
print('Exiting...')
|
||||
|
||||
def readcam(self):
|
||||
running = self.state['event_handler'](self.state)
|
||||
running = self.state.event_handler()
|
||||
|
||||
if not running:
|
||||
self.app.quit()
|
||||
|
|
@ -184,12 +184,12 @@ class MainWindow(QtWidgets.QWidget):
|
|||
self.reqqueue = {}
|
||||
self.current = {}
|
||||
|
||||
for ctx in self.state['contexts']:
|
||||
for ctx in self.state.contexts:
|
||||
|
||||
self.reqqueue[ctx['idx']] = []
|
||||
self.current[ctx['idx']] = []
|
||||
self.reqqueue[ctx.idx] = []
|
||||
self.current[ctx.idx] = []
|
||||
|
||||
for stream in ctx['streams']:
|
||||
for stream in ctx.streams:
|
||||
self.textures[stream] = None
|
||||
|
||||
num_tiles = len(self.textures)
|
||||
|
|
@ -312,12 +312,12 @@ class MainWindow(QtWidgets.QWidget):
|
|||
if len(queue) == 0:
|
||||
continue
|
||||
|
||||
ctx = next(ctx for ctx in self.state['contexts'] if ctx['idx'] == ctx_idx)
|
||||
ctx = next(ctx for ctx in self.state.contexts if ctx.idx == ctx_idx)
|
||||
|
||||
if self.current[ctx_idx]:
|
||||
old = self.current[ctx_idx]
|
||||
self.current[ctx_idx] = None
|
||||
self.state['request_prcessed'](ctx, old)
|
||||
self.state.request_processed(ctx, old)
|
||||
|
||||
next_req = queue.pop(0)
|
||||
self.current[ctx_idx] = next_req
|
||||
|
|
@ -336,8 +336,8 @@ class MainWindow(QtWidgets.QWidget):
|
|||
|
||||
size = self.size()
|
||||
|
||||
for idx, ctx in enumerate(self.state['contexts']):
|
||||
for stream in ctx['streams']:
|
||||
for idx, ctx in enumerate(self.state.contexts):
|
||||
for stream in ctx.streams:
|
||||
if self.textures[stream] is None:
|
||||
continue
|
||||
|
||||
|
|
@ -359,5 +359,5 @@ class MainWindow(QtWidgets.QWidget):
|
|||
assert(b)
|
||||
|
||||
def handle_request(self, ctx, req):
|
||||
self.reqqueue[ctx['idx']].append(req)
|
||||
self.reqqueue[ctx.idx].append(req)
|
||||
self.update()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue