From 35a41a976c63da821bc1e23f2b0992187c392c81 Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Mon, 30 Oct 2017 22:46:33 +0200 Subject: [PATCH] mmal: use COMMON_RESOLUTIONS --- motioneye/config.py | 2 +- motioneye/utils.py | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/motioneye/config.py b/motioneye/config.py index 5100c95..39099ae 100644 --- a/motioneye/config.py +++ b/motioneye/config.py @@ -1245,7 +1245,7 @@ def motion_camera_dict_to_ui(data): ui['device_url'] = data['mmalcam_name'] ui['proto'] = 'mmal' - resolutions = utils.RPI_MMAL_RESOLUTIONS + resolutions = utils.COMMON_RESOLUTIONS resolutions = [r for r in resolutions if motionctl.resolution_is_valid(*r)] ui['available_resolutions'] = [(str(w) + 'x' + str(h)) for (w, h) in resolutions] ui['resolution'] = str(data['width']) + 'x' + str(data['height']) diff --git a/motioneye/utils.py b/motioneye/utils.py index afab32c..b4cfb63 100644 --- a/motioneye/utils.py +++ b/motioneye/utils.py @@ -67,15 +67,6 @@ COMMON_RESOLUTIONS = [ (1920, 1080) ] -RPI_MMAL_RESOLUTIONS = [ - (640, 480), - (1280, 720), - (1280, 960), - (1920, 1080), - (1920, 1088), - (2592, 1944) -] - def _(x): return x # this could later be replaced by a proper translate function -- 2.39.5