Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use small preview buffer for HQ camera, so long exposures can complete with 128MB GPU RAM #638

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

Use small preview buffer for HQ camera, so long exposures can complete with 128MB GPU RAM #638

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
11163a6
use small preview buffer when out of resources
chrisruk Jul 22, 2020
6aa4217
Use smaller preview buffer size, for 76MB GPU RAM
chrisruk Jul 28, 2020
87021ea
Switch small preview resolution to 1080p
chrisruk Aug 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 17 additions & 6 deletions picamera/camera.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2232,7 +2232,7 @@ def _get_config(self):
colorspace=self._camera.outputs[0].colorspace
)

def _configure_camera(self, old, new):
def _configure_camera(self, old, new, small_preview=False):
"""
An internal method for setting a new camera mode, framerate,
resolution, clock_mode, and/or ISP blocks.
Expand Down Expand Up @@ -2304,13 +2304,19 @@ def _configure_camera(self, old, new):
cc.max_stills_h = new.resolution.height
cc.stills_yuv422 = 0
cc.one_shot_stills = 1
cc.max_preview_video_w = new.resolution.width
cc.max_preview_video_h = new.resolution.height
if small_preview:
cc.max_preview_video_w = 1920
cc.max_preview_video_h = 1080
else:
cc.max_preview_video_w = new.resolution.width
cc.max_preview_video_h = new.resolution.height
cc.num_preview_video_frames = max(3, fps_high // 10)
cc.stills_capture_circular_buffer_height = 0
cc.fast_preview_resume = 0
cc.use_stc_timestamp = new.clock_mode
self._camera.control.params[mmal.MMAL_PARAMETER_CAMERA_CONFIG] = cc
if small_preview:
preview_resolution = mo.to_resolution((1920,1080))

# Clamp preview resolution to camera's resolution
if (
Expand Down Expand Up @@ -2613,9 +2619,14 @@ def _set_resolution(self, value):
"Invalid resolution requested: %r" % (value,))
config = self._get_config()
self._disable_camera()
self._configure_camera(config, config._replace(resolution=value))
self._configure_splitter()
self._enable_camera()
try:
self._configure_camera(config, config._replace(resolution=value))
self._configure_splitter()
self._enable_camera()
except PiCameraMMALError:
self._configure_camera(config, config._replace(resolution=value), small_preview=True)
self._configure_splitter()
self._enable_camera()
resolution = property(_get_resolution, _set_resolution, doc="""
Retrieves or sets the resolution at which image captures, video
recordings, and previews will be captured.
Expand Down